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/03 22:00:17 UTC
git commit: updated refs/heads/4.3 to 2795c4e
Updated Branches:
refs/heads/4.3 07ad69ceb -> 2795c4ecf
CLOUDSTACK-5737: ignore umount secondary storage failure during backup snapshot
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2795c4ec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2795c4ec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2795c4ec
Branch: refs/heads/4.3
Commit: 2795c4ecfb5d228278ab5eb338d1edd31ab736b9
Parents: 07ad69c
Author: edison <su...@gmail.com>
Authored: Fri Jan 3 12:59:54 2014 -0800
Committer: edison <su...@gmail.com>
Committed: Fri Jan 3 12:59:54 2014 -0800
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2795c4ec/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 3ce9c29..6d1705c 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
@@ -803,8 +803,13 @@ public class KVMStorageProcessor implements StorageProcessor {
} catch (Exception ex) {
s_logger.debug("Failed to delete snapshots on primary", ex);
}
- if (secondaryStoragePool != null) {
- secondaryStoragePool.delete();
+
+ try {
+ if (secondaryStoragePool != null) {
+ secondaryStoragePool.delete();
+ }
+ } catch (Exception ex) {
+ s_logger.debug("Failed to delete secondary storage", ex);
}
}
}