You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2023/05/31 11:58:35 UTC
[cloudstack] 04/23: Fixed uuid
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a commit to branch LiveStoragMigrationScaleIOMain
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 78def433cc6181c29af2a84333c468ad61253b34
Author: Harikrishna Patnala <ha...@gmail.com>
AuthorDate: Thu Feb 23 10:46:17 2023 +0530
Fixed uuid
---
.../kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java | 4 +---
.../storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
index 420df975838..8ad52664751 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
@@ -147,12 +147,10 @@ public final class LibvirtMigrateVolumeCommandWrapper extends CommandWrapper<Mig
};
return new MigrateVolumeAnswer(command, true, null, destPath);
- } catch (LibvirtException e) {
+ } catch (Exception e) {
String msg = "Migrate volume failed due to " + e.toString();
LOGGER.warn(msg, e);
return new MigrateVolumeAnswer(command, false, msg, null);
- } catch (InternalErrorException e) {
- throw new RuntimeException(e);
} finally {
if (dm != null) {
try {
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
index 98b27939ca9..81abff9ff38 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
@@ -775,7 +775,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
final String destStoragePoolId = destStoragePool.getPath();
//CreateObjectAnswer createAnswer = createVolume((VolumeInfo) destData, destStore.getId());
//String destVolumePath = createAnswer.getData().getPath();
- final String destVolumeId = UUID.randomUUID().toString();
+ final String destVolumeId = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 16);
final String destScaleIOVolumeName = String.format("%s-%s-%s-%s", ScaleIOUtil.VOLUME_PREFIX, srcData.getId(),
srcData.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value());
String destVolumePath = String.format("%s:%s", destVolumeId, destScaleIOVolumeName);