cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [1/2] git commit: updated refs/heads/4.2 to e61a380
Date Sat, 10 Aug 2013 01:12:26 GMT
Updated Branches:
  refs/heads/4.2 17715d7e7 -> e61a38087


CLOUDSTACK-4204: return a ZoneScope in picking cache storage.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e61a3808
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e61a3808
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e61a3808

Branch: refs/heads/4.2
Commit: e61a38087d158da51f7b945d16e4749a83512ab5
Parents: 17f4a63
Author: Min Chen <min.chen@citrix.com>
Authored: Fri Aug 9 18:11:53 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Fri Aug 9 18:12:15 2013 -0700

----------------------------------------------------------------------
 .../cloudstack/storage/motion/AncientDataMotionStrategy.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e61a3808/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index 893e9bc..b76b7ee 100644
--- a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -182,11 +182,11 @@ public class AncientDataMotionStrategy implements DataMotionStrategy
{
 
         Scope selectedScope = null;
         if (srcScope.getScopeId() != null) {
-            selectedScope = srcScope;
+            selectedScope = getZoneScope(srcScope);
         } else if (destScope.getScopeId() != null) {
-            selectedScope = destScope;
+            selectedScope = getZoneScope(destScope);
         } else {
-            s_logger.warn("Cannot find a zone-wide scope for move between cache store and
image store");
+            s_logger.warn("Cannot find a zone-wide scope for movement that needs a cache
storage");
         }
         return selectedScope;
     }


Mime
View raw message