You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/01/13 23:56:30 UTC
git commit: updated refs/heads/4.3 to 8dda699
Updated Branches:
refs/heads/4.3 b6698f354 -> 8dda69952
CLOUDSTACK-5857: for some reasons, delete secondary pool failed during copy template from secondary storage to primary storage, but the volume is already copied to primary storage, we didn't clean up the volume on primary storage, then all the following copy the same template to primary storage failed, as we are always using the same uuid when creating a new volume, libvirt complaining that the volume already exists.
Current fix is ignoring "the delete secondary storage error".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8dda6995
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8dda6995
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8dda6995
Branch: refs/heads/4.3
Commit: 8dda69952f93b6fcdaf45f0d3cb82b074f1c320a
Parents: b6698f3
Author: edison <su...@gmail.com>
Authored: Mon Jan 13 14:55:47 2014 -0800
Committer: edison <su...@gmail.com>
Committed: Mon Jan 13 14:55:47 2014 -0800
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 8 ++++++--
.../cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 2 +-
.../com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java | 7 ++++++-
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8dda6995/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 6d1705c..cd57643 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -237,8 +237,12 @@ public class KVMStorageProcessor implements StorageProcessor {
} catch (CloudRuntimeException e) {
return new CopyCmdAnswer(e.toString());
} finally {
- if (secondaryPool != null) {
- secondaryPool.delete();
+ try {
+ if (secondaryPool != null) {
+ secondaryPool.delete();
+ }
+ } catch(Exception e) {
+ s_logger.debug("Failed to clean up secondary storage", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8dda6995/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 7e3c9e0..012c8a5 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -617,7 +617,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
}
s_logger.error("failed in umount retry");
}
- throw new CloudRuntimeException(e.toString());
+ throw new CloudRuntimeException(e.toString(), e);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8dda6995/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
index 32aa603..7eed474 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -252,7 +252,12 @@ public class LibvirtStoragePool implements KVMStoragePool {
@Override
public boolean delete() {
- return this._storageAdaptor.deleteStoragePool(this);
+ try {
+ return this._storageAdaptor.deleteStoragePool(this);
+ } catch (Exception e) {
+ s_logger.debug("Failed to delete storage pool", e);
+ }
+ return false;
}
@Override