You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/08/27 23:14:15 UTC
git commit: updated refs/heads/master to 18b301e
Updated Branches:
refs/heads/master a2ade4523 -> 18b301edb
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/18b301ed
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/18b301ed
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/18b301ed
Branch: refs/heads/master
Commit: 18b301edb9047f0d42f2599adcd392f0ea10c6fe
Parents: a2ade45
Author: Min Chen <mi...@citrix.com>
Authored: Tue Aug 27 14:11:55 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Aug 27 14:13:59 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/18b301ed/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 0cd8ad3..c26dfde 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -95,13 +95,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