You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2014/04/10 14:34:33 UTC
git commit: updated refs/heads/master to 4ba688f
Repository: cloudstack
Updated Branches:
refs/heads/master 26746feb3 -> 4ba688f07
kvm: Add more debugging information when a volume is deleted.
There was no clear reference of libvirt being instructed to remove
the volume
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4ba688f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4ba688f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4ba688f0
Branch: refs/heads/master
Commit: 4ba688f07d9b629aa8e6420eda8092c92aa3d180
Parents: 26746fe
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Thu Apr 10 14:33:49 2014 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Apr 10 14:33:49 2014 +0200
----------------------------------------------------------------------
.../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ba688f0/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 296f60a..b13fe65 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
@@ -774,6 +774,9 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
rbd.close(image);
r.ioCtxDestroy(io);
+
+ s_logger.debug("Succesfully unprotected and removed any snapshots of " + pool.getSourceDir() + "/" + uuid +
+ " Continuing to remove the RBD image");
} catch (RadosException e) {
throw new CloudRuntimeException(e.toString());
} catch (RbdException e) {
@@ -784,6 +787,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
LibvirtStoragePool libvirtPool = (LibvirtStoragePool)pool;
try {
StorageVol vol = getVolume(libvirtPool.getPool(), uuid);
+ s_logger.debug("Instructing libvirt to remove volume " + uuid + " from pool " + pool.getUuid());
deleteVol(libvirtPool, vol);
vol.free();
return true;