Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E6CA711DD5 for ; Fri, 28 Mar 2014 23:35:45 +0000 (UTC) Received: (qmail 73801 invoked by uid 500); 28 Mar 2014 23:35:25 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 73283 invoked by uid 500); 28 Mar 2014 23:35:12 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 73144 invoked by uid 99); 28 Mar 2014 23:35:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Mar 2014 23:35:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2C4B8915F64; Fri, 28 Mar 2014 23:35:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyxu@apache.org To: commits@cloudstack.apache.org Date: Fri, 28 Mar 2014 23:35:18 -0000 Message-Id: In-Reply-To: <9d0ff7d164e64629a8936d7f26e0301d@git.apache.org> References: <9d0ff7d164e64629a8936d7f26e0301d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/27] git commit: updated refs/heads/master to d4d5cab 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 Authored: Fri Jan 3 12:59:54 2014 -0800 Committer: Anthony Xu 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); } } }