Updated Branches: refs/heads/4.2-forward 13d9070d5 -> 21cb33a02
CLOUDSTACK-4516:[Upgrade][VMWare] MySQLIntegrityConstraintViolationException while performing any task using local storage after upgrade from 3.0.7 to 4.2. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21cb33a0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21cb33a0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21cb33a0 Branch: refs/heads/4.2-forward Commit: 21cb33a02ce2ff1e1b22af275068451a3ab6add5 Parents: 13d9070 Author: Min Chen <[email protected]> Authored: Tue Aug 27 14:11:55 2013 -0700 Committer: Min Chen <[email protected]> Committed: Tue Aug 27 14:11:55 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/storage/endpoint/DefaultEndPointSelector.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21cb33a0/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 a1d7315..98c6a3f 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -96,13 +96,13 @@ public class DefaultEndPointSelector implements EndPointSelector { sbuilder.append(sqlBase); if (scope.getScopeType() == ScopeType.HOST) { - sbuilder.append(" and id = "); + sbuilder.append(" and h.id = "); sbuilder.append(scope.getScopeId()); } else if (scope.getScopeType() == ScopeType.CLUSTER) { - sbuilder.append(" and cluster_id = "); + sbuilder.append(" and h.cluster_id = "); sbuilder.append(scope.getScopeId()); } else if (scope.getScopeType() == ScopeType.ZONE) { - sbuilder.append(" and data_center_id = "); + sbuilder.append(" and h.data_center_id = "); sbuilder.append(scope.getScopeId()); } // TODO: order by rand() is slow if there are lot of hosts
