Updated Branches: refs/heads/object_store 6e0757bbf -> 7a3e7d189
Send CopyCommand to Host instead of randomly picking host and ssvm in backup snapshot. For VMware, it will delegate to ssvm in VMwareGuru. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a3e7d18 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a3e7d18 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a3e7d18 Branch: refs/heads/object_store Commit: 7a3e7d1891fd2da730a4decda6e130c596f1e65a Parents: 6e0757b Author: Min Chen <[email protected]> Authored: Thu Jun 13 11:21:25 2013 -0700 Committer: Min Chen <[email protected]> Committed: Thu Jun 13 11:21:25 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/storage/endpoint/DefaultEndPointSelector.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a3e7d18/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java index 53a8724..a44bbec 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -55,8 +55,6 @@ public class DefaultEndPointSelector implements EndPointSelector { private static final Logger s_logger = Logger.getLogger(DefaultEndPointSelector.class); @Inject HostDao hostDao; - private String findOneHostInaScope = "select id from host where " - + " status = 'Up' and type in ('Routing', 'SecondaryStorageVM') "; private String findOneHostOnPrimaryStorage = "select id from host where " + "status = 'Up' and type = 'Routing' "; protected boolean moveBetweenPrimaryImage(DataStore srcStore, DataStore destStore) { @@ -158,7 +156,7 @@ public class DefaultEndPointSelector implements EndPointSelector { // if both are zone scope selectedScope = srcScope; } - return findEndPointInScope(selectedScope, findOneHostInaScope); + return findEndPointInScope(selectedScope, findOneHostOnPrimaryStorage); } @Override
