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/04220daf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04220daf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04220daf Branch: refs/heads/4.4 Commit: 04220daf4c4d5d637fcc3664551a01c85ff36457 Parents: 24d1f16 Author: edison <[email protected]> Authored: Fri Jan 3 12:59:54 2014 -0800 Committer: Edison Su <[email protected]> Committed: Thu Mar 27 17:38:38 2014 -0700 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04220daf/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 0024c8e..a47b2ca 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 @@ -812,8 +812,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); } } }
