cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject [11/27] git commit: updated refs/heads/master to d4d5cab
Date Fri, 28 Mar 2014 23:35:18 GMT
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/a8bfb3dd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a8bfb3dd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a8bfb3dd

Branch: refs/heads/master
Commit: a8bfb3dd00003adfa23ba85a3524ffdcb7d100f6
Parents: 6b79945
Author: edison <sudison@gmail.com>
Authored: Fri Jan 3 12:59:54 2014 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Fri Mar 28 16:22:24 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/a8bfb3dd/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);
             }
         }
     }


Mime
View raw message