This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new f80d2052845 linstor: Fix volume format and make resource available on
copy target (#8811)
f80d2052845 is described below
commit f80d20528457838009f1f8195e6476bd8c9c4f27
Author: Rene Peinthor <[email protected]>
AuthorDate: Mon May 6 11:00:22 2024 +0200
linstor: Fix volume format and make resource available on copy target
(#8811)
Linstor primary storage forgot to make sure
the volume download/copy target has a Linstor resource available.
---
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git
a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
index 328b3d21d0a..9612781ee4c 100644
---
a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
+++
b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
@@ -102,6 +102,7 @@ import
org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import
org.apache.cloudstack.storage.datastore.util.LinstorConfigurationManager;
import org.apache.cloudstack.storage.datastore.util.LinstorUtil;
import org.apache.cloudstack.storage.to.SnapshotObjectTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.cloudstack.storage.volume.VolumeObject;
import org.apache.log4j.Logger;
@@ -798,6 +799,15 @@ public class LinstorPrimaryDataStoreDriverImpl implements
PrimaryDataStoreDriver
|| srcData.getDataStore().getRole() == DataStoreRole.ImageCache);
}
+ private static boolean canCopyVolumeCond(DataObject srcData, DataObject
dstData) {
+ // Volume download from Linstor primary storage
+ return srcData.getType() == DataObjectType.VOLUME
+ && (dstData.getType() == DataObjectType.VOLUME ||
dstData.getType() == DataObjectType.TEMPLATE)
+ && srcData.getDataStore().getRole() == DataStoreRole.Primary
+ && (dstData.getDataStore().getRole() == DataStoreRole.Image
+ || dstData.getDataStore().getRole() ==
DataStoreRole.ImageCache);
+ }
+
@Override
public boolean canCopy(DataObject srcData, DataObject dstData)
{
@@ -814,6 +824,10 @@ public class LinstorPrimaryDataStoreDriverImpl implements
PrimaryDataStoreDriver
return storagePoolVO != null
&& storagePoolVO.getPoolType() ==
Storage.StoragePoolType.Linstor
&& tInfo.getSize() != null;
+ } else if (canCopyVolumeCond(srcData, dstData)) {
+ VolumeInfo srcVolInfo = (VolumeInfo) srcData;
+ StoragePoolVO storagePool =
_storagePoolDao.findById(srcVolInfo.getPoolId());
+ return
storagePool.getStorageProviderName().equals(LinstorUtil.PROVIDER_NAME);
}
return false;
}
@@ -844,6 +858,9 @@ public class LinstorPrimaryDataStoreDriverImpl implements
PrimaryDataStoreDriver
} else if (canCopyTemplateCond(srcData, dstData)) {
Answer answer = copyTemplate(srcData, dstData);
res = new CopyCommandResult(null, answer);
+ } else if (canCopyVolumeCond(srcData, dstData)) {
+ Answer answer = copyVolume(srcData, dstData);
+ res = new CopyCommandResult(null, answer);
} else {
Answer answer = new Answer(null, false, "noimpl");
res = new CopyCommandResult(null, answer);
@@ -965,6 +982,43 @@ public class LinstorPrimaryDataStoreDriverImpl implements
PrimaryDataStoreDriver
return answer;
}
+ private Answer copyVolume(DataObject srcData, DataObject dstData) {
+ VolumeInfo srcVolInfo = (VolumeInfo) srcData;
+ final StoragePoolVO pool =
_storagePoolDao.findById(srcVolInfo.getDataStore().getId());
+ final DevelopersApi api =
LinstorUtil.getLinstorAPI(pool.getHostAddress());
+ final String rscName = LinstorUtil.RSC_PREFIX + srcVolInfo.getUuid();
+
+ VolumeObjectTO to = (VolumeObjectTO) srcVolInfo.getTO();
+ // patch source format
+ // Linstor volumes are stored as RAW, but we can't set the correct
format as RAW (we use QCOW2)
+ // otherwise create template from snapshot won't work, because this
operation
+ // uses the format of the base volume and we backup snapshots as QCOW2
+ //
https://github.com/apache/cloudstack/pull/8802#issuecomment-2024019927
+ to.setFormat(Storage.ImageFormat.RAW);
+ int nMaxExecutionSeconds = NumbersUtil.parseInt(
+ _configDao.getValue(Config.CopyVolumeWait.key()), 10800);
+ CopyCommand cmd = new CopyCommand(
+ to,
+ dstData.getTO(),
+ nMaxExecutionSeconds,
+ VirtualMachineManager.ExecuteInSequence.value());
+ Answer answer;
+
+ try {
+ Optional<RemoteHostEndPoint> optEP = getLinstorEP(api, rscName);
+ if (optEP.isPresent()) {
+ answer = optEP.get().sendMessage(cmd);
+ }
+ else {
+ answer = new Answer(cmd, false, "Unable to get matching
Linstor endpoint.");
+ }
+ } catch (ApiException exc) {
+ s_logger.error("copy volume failed: ", exc);
+ throw new CloudRuntimeException(exc.getBestMessage());
+ }
+ return answer;
+ }
+
/**
* Create a temporary resource from the snapshot to backup, so we can copy
the data on a diskless agent
* @param api Linstor Developer api object
