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 2013/07/08 20:22:13 UTC
git commit: updated refs/heads/master-6-17-stable to e3e16ba
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 <su...@gmail.com>
Authored: Mon Jul 8 11:21:35 2013 -0700
Committer: Edison Su <su...@gmail.com>
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;