From 76f52af8f39dc5c397af6f5c3bebf3fc20b62a34 Mon Sep 17 00:00:00 2001 From: slavkap <51903378+slavkap@users.noreply.github.com> Date: Wed, 10 Aug 2022 12:11:32 +0300 Subject: [PATCH] removed the use of SharedMountPoint storage type for the StorPool plugin (#6552) Fixes #6455 The default storage adaptor - LibvirtStorageAdaptor - is used by different storage types and doesn't use the annotation @StorageAdaptorInfo. In this case, a storage plugin that wants to adopt one of the predefined storage pool types will override the default behaviour. If fixing the issue in general (for new storage plugins or current ones that want to reuse the existing storage pool types) would affect all volume/snapshot/VM cases. This will lead to the need of extensive testing for each storage plugin for which we don't have the resources to do it. That's why this patch fixes the old behaviour for the SharedMountPoint by adding a new storage pool type for the StorPool plugin. --- .../main/java/com/cloud/storage/Storage.java | 3 +- .../upgrade/dao/Upgrade41700to41710.java | 42 +++++++++++++++++-- .../resource/LibvirtComputingResource.java | 6 ++- .../kvm/storage/StorPoolStorageAdaptor.java | 2 +- .../StorPoolPrimaryDataStoreDriver.java | 3 +- .../StorPoolPrimaryDataStoreLifeCycle.java | 2 +- 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/api/src/main/java/com/cloud/storage/Storage.java b/api/src/main/java/com/cloud/storage/Storage.java index d44628a198a..300944559d6 100644 --- a/api/src/main/java/com/cloud/storage/Storage.java +++ b/api/src/main/java/com/cloud/storage/Storage.java @@ -148,7 +148,8 @@ public class Storage { PowerFlex(true, true), // Dell EMC PowerFlex/ScaleIO (formerly VxFlexOS) ManagedNFS(true, false), Linstor(true, true), - DatastoreCluster(true, true); // for VMware, to abstract pool of clusters + DatastoreCluster(true, true), // for VMware, to abstract pool of clusters + StorPool(true, true); private final boolean shared; private final boolean overprovisioning; diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41700to41710.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41700to41710.java index 6841e7de3b7..5959dd46990 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41700to41710.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41700to41710.java @@ -16,18 +16,30 @@ // under the License. package com.cloud.upgrade.dao; -import com.cloud.upgrade.SystemVmTemplateRegistration; -import com.cloud.utils.exception.CloudRuntimeException; -import org.apache.log4j.Logger; - import java.io.InputStream; import java.sql.Connection; +import java.util.List; + +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.apache.log4j.Logger; + +import com.cloud.storage.Storage.StoragePoolType; +import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.VolumeDao; +import com.cloud.storage.dao.VolumeDaoImpl; +import com.cloud.upgrade.SystemVmTemplateRegistration; +import com.cloud.utils.exception.CloudRuntimeException; public class Upgrade41700to41710 implements DbUpgrade, DbUpgradeSystemVmTemplate { final static Logger LOG = Logger.getLogger(Upgrade41610to41700.class); private SystemVmTemplateRegistration systemVmTemplateRegistration; + private PrimaryDataStoreDao storageDao; + private VolumeDao volumeDao; + @Override public String[] getUpgradableVersionRange() { return new String[] {"4.17.0.0", "4.17.1.0"}; @@ -56,6 +68,7 @@ public class Upgrade41700to41710 implements DbUpgrade, DbUpgradeSystemVmTemplate @Override public void performDataMigration(Connection conn) { + updateStorPoolStorageType(); } @Override @@ -83,4 +96,25 @@ public class Upgrade41700to41710 implements DbUpgrade, DbUpgradeSystemVmTemplate throw new CloudRuntimeException("Failed to find / register SystemVM template(s)"); } } + + private void updateStorPoolStorageType() { + storageDao = new PrimaryDataStoreDaoImpl(); + List storPoolPools = storageDao.findPoolsByProvider("StorPool"); + for (StoragePoolVO storagePoolVO : storPoolPools) { + if (StoragePoolType.SharedMountPoint == storagePoolVO.getPoolType()) { + storagePoolVO.setPoolType(StoragePoolType.StorPool); + storageDao.update(storagePoolVO.getId(), storagePoolVO); + } + updateStorageTypeForStorPoolVolumes(storagePoolVO.getId()); + } + } + + private void updateStorageTypeForStorPoolVolumes(long storagePoolId) { + volumeDao = new VolumeDaoImpl(); + List volumes = volumeDao.findByPoolId(storagePoolId, null); + for (VolumeVO volumeVO : volumes) { + volumeVO.setPoolType(StoragePoolType.StorPool); + volumeDao.update(volumeVO.getId(), volumeVO); + } + } } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index db1f06290c9..a3a5290671a 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -2848,7 +2848,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv dataStoreUrl = "nfs://" + psHost + File.separator + psPath; physicalDisk = getPhysicalDiskFromNfsStore(dataStoreUrl, data); } else if (primaryDataStoreTO.getPoolType().equals(StoragePoolType.SharedMountPoint) || - primaryDataStoreTO.getPoolType().equals(StoragePoolType.Filesystem)) { + primaryDataStoreTO.getPoolType().equals(StoragePoolType.Filesystem) || + primaryDataStoreTO.getPoolType().equals(StoragePoolType.StorPool)) { physicalDisk = getPhysicalDiskPrimaryStore(primaryDataStoreTO, data); } } @@ -2868,7 +2869,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv && (pool.getType() == StoragePoolType.NetworkFilesystem || pool.getType() == StoragePoolType.SharedMountPoint || pool.getType() == StoragePoolType.Filesystem - || pool.getType() == StoragePoolType.Gluster)) { + || pool.getType() == StoragePoolType.Gluster + || pool.getType() == StoragePoolType.StorPool)) { setBackingFileFormat(physicalDisk.getPath()); } diff --git a/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java b/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java index a35787c205b..d0fe5adaeee 100644 --- a/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java +++ b/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java @@ -39,7 +39,7 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.OutputInterpreter; import com.cloud.utils.script.Script; -@StorageAdaptorInfo(storagePoolType=StoragePoolType.SharedMountPoint) +@StorageAdaptorInfo(storagePoolType=StoragePoolType.StorPool) public class StorPoolStorageAdaptor implements StorageAdaptor { public static void SP_LOG(String fmt, Object... args) { try (PrintWriter spLogFile = new PrintWriter(new BufferedWriter(new FileWriter("/var/log/cloudstack/agent/storpool-agent.log", true)))) { diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java index e9429c274fc..c5c2bc71a40 100644 --- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java +++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java @@ -233,7 +233,6 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver { VolumeVO volume = volumeDao.findById(vinfo.getId()); volume.setPoolId(dataStore.getId()); - volume.setPoolType(StoragePoolType.SharedMountPoint); volume.setPath(path); volumeDao.update(volume.getId(), volume); @@ -716,7 +715,7 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver { final String name = StorPoolStorageAdaptor.getVolumeNameFromPath(srcTO.getPath(), true); StorPoolUtil.spLog("StorpoolPrimaryDataStoreDriverImpl.copyAsnc DST tmpSnapName=%s ,srcUUID=%s", name, srcTO.getUuid()); - if (checkStoragePool != null && checkStoragePool.getPoolType().equals(StoragePoolType.SharedMountPoint)) { + if (checkStoragePool != null && checkStoragePool.getPoolType().equals(StoragePoolType.StorPool)) { SpConnectionDesc conn = StorPoolUtil.getSpConnection(dstData.getDataStore().getUuid(), dstData.getDataStore().getId(), storagePoolDetailsDao, primaryStoreDao); String baseOn = StorPoolStorageAdaptor.getVolumeNameFromPath(srcTO.getPath(), true); //uuid tag will be the same as srcData.uuid diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/StorPoolPrimaryDataStoreLifeCycle.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/StorPoolPrimaryDataStoreLifeCycle.java index 8ed39327f39..4dbc7e4a22c 100644 --- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/StorPoolPrimaryDataStoreLifeCycle.java +++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/StorPoolPrimaryDataStoreLifeCycle.java @@ -164,7 +164,7 @@ public class StorPoolPrimaryDataStoreLifeCycle implements PrimaryDataStoreLifeCy parameters.setUuid(conn.getTemplateName() + ";" + UUID.randomUUID().toString()); parameters.setZoneId(zoneId); parameters.setProviderName(providerName); - parameters.setType(StoragePoolType.SharedMountPoint); + parameters.setType(StoragePoolType.StorPool); parameters.setHypervisorType(HypervisorType.KVM); parameters.setManaged(false); parameters.setHost("n/a");