You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/11/02 18:34:49 UTC
[2/6] git commit: CS-16213: skip agent rebalancing when the
management server doesn't own the host any more
CS-16213: skip agent rebalancing when the management server doesn't own the host any more
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3948d7d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3948d7d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3948d7d7
Branch: refs/heads/master
Commit: 3948d7d7c55581eadb4917cd317234c294f61ff3
Parents: 62607c9
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Oct 23 10:47:44 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Nov 2 09:59:37 2012 -0700
----------------------------------------------------------------------
.../agent/manager/ClusteredAgentManagerImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3948d7d7/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 78143fd..93c3912 100755
--- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -863,7 +863,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
continue;
}
- if (transferMap.getInitialOwner() != _nodeId || attache.forForward()) {
+ if (transferMap.getInitialOwner() != _nodeId || attache == null || attache.forForward()) {
s_logger.debug("Management server " + _nodeId + " doesn't own host id=" + hostId + " any more, skipping rebalance for the host");
iterator.remove();
_hostTransferDao.completeAgentTransfer(hostId);