Updated Branches: refs/heads/object_store 492127c03 -> e6faa47a4
Fix a bug in searching for eligible image store when we pass a ZoneScope with scopeId = null. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ff735b4d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff735b4d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff735b4d Branch: refs/heads/object_store Commit: ff735b4d8190f89ae70de63cbef6049465dfd36a Parents: 492127c Author: Min Chen <[email protected]> Authored: Mon May 13 11:07:06 2013 -0700 Committer: Min Chen <[email protected]> Committed: Mon May 13 11:07:06 2013 -0700 ---------------------------------------------------------------------- .../storage/image/db/ImageStoreDaoImpl.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff735b4d/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDaoImpl.java index d747829..e6a0e06 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDaoImpl.java @@ -81,10 +81,13 @@ public class ImageStoreDaoImpl extends GenericDaoBase<ImageStoreVO, Long> implem public List<ImageStoreVO> findByScope(ZoneScope scope) { SearchCriteria<ImageStoreVO> sc = createSearchCriteria(); sc.addAnd("role", SearchCriteria.Op.EQ, DataStoreRole.Image); - SearchCriteria<ImageStoreVO> scc = createSearchCriteria(); - scc.addOr("scope", SearchCriteria.Op.EQ, ScopeType.REGION); - scc.addOr("dcId", SearchCriteria.Op.EQ, scope.getScopeId()); - sc.addAnd("scope", SearchCriteria.Op.SC, scc); + if (scope.getScopeId() != null) { + SearchCriteria<ImageStoreVO> scc = createSearchCriteria(); + scc.addOr("scope", SearchCriteria.Op.EQ, ScopeType.REGION); + scc.addOr("dcId", SearchCriteria.Op.EQ, scope.getScopeId()); + sc.addAnd("scope", SearchCriteria.Op.SC, scc); + } + // we should return all image stores if cross-zone scope is passed (scopeId = null) return listBy(sc); }
