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 279A71027C for ; Mon, 8 Jul 2013 18:22:14 +0000 (UTC) Received: (qmail 51796 invoked by uid 500); 8 Jul 2013 18:22:14 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 51778 invoked by uid 500); 8 Jul 2013 18:22:14 -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 51770 invoked by uid 99); 8 Jul 2013 18:22:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jul 2013 18:22:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4D6AE885F15; Mon, 8 Jul 2013 18:22:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master-6-17-stable to e3e16ba Date: Mon, 8 Jul 2013 18:22:13 +0000 (UTC) Updated Branches: refs/heads/master-6-17-stable 7054db447 -> e3e16ba0f CLOUDSTACK-3329: it's the same bug that storage pool is randomly missing Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3e16ba0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3e16ba0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3e16ba0 Branch: refs/heads/master-6-17-stable Commit: e3e16ba0fab68a102deaec32be097868eb53209a Parents: 7054db4 Author: Edison Su Authored: Mon Jul 8 11:21:35 2013 -0700 Committer: Edison Su Committed: Mon Jul 8 11:21:50 2013 -0700 ---------------------------------------------------------------------- .../storage/motion/AncientDataMotionStrategy.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3e16ba0/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java index a6880c3..9bc5618 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java +++ b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java @@ -501,7 +501,17 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { errMsg = e.toString(); } CopyCommandResult result = new CopyCommandResult(null, answer); - result.setResult(errMsg); + if (!answer.getResult()) { + if (answer.getDetails() != null) { + result.setResult(answer.getDetails()); + } else { + result.setSuccess(false); + } + } + + if (errMsg != null) { + result.setResult(errMsg); + } callback.complete(result); return null;