You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/08/07 23:43:42 UTC
git commit: updated refs/heads/master to e115ee4
Updated Branches:
refs/heads/master 7d5e4c666 -> e115ee402
CLOUDSTACK-3535: still maintain stop agent wont trigger HA
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e115ee40
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e115ee40
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e115ee40
Branch: refs/heads/master
Commit: e115ee40268d66fcc00b733b4cc45bffe2891341
Parents: 7d5e4c6
Author: Edison Su <su...@gmail.com>
Authored: Wed Aug 7 14:41:36 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Wed Aug 7 14:43:16 2013 -0700
----------------------------------------------------------------------
client/tomcatconf/nonossComponentContext.xml.in | 1 +
plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java | 2 ++
server/src/com/cloud/agent/manager/AgentManagerImpl.java | 6 +-----
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e115ee40/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index 6fd51ef..e9290db 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -271,6 +271,7 @@
<ref bean="VmwareInvestigator"/>
<ref bean="UserVmDomRInvestigator"/>
<ref bean="ManagementIPSystemVMInvestigator"/>
+ <ref bean="KVMInvestigator"/>
</list>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e115ee40/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java
index 65024f8..4d83d09 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java
@@ -30,9 +30,11 @@ import com.cloud.resource.ResourceManager;
import com.cloud.utils.component.AdapterBase;
import org.apache.log4j.Logger;
+import javax.ejb.Local;
import javax.inject.Inject;
import java.util.List;
+@Local(value=Investigator.class)
public class KVMInvestigator extends AdapterBase implements Investigator {
private final static Logger s_logger = Logger.getLogger(KVMInvestigator.class);
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e115ee40/server/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index cf59b31..200b5d7 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -779,11 +779,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
s_logger.debug("Deregistering link for " + hostId + " with state " + nextStatus);
}
- //For KVM, if removeagent is false, don't remove the agent in agentmap, pingtimeout will pick it up.
- if (host.getHypervisorType() != HypervisorType.KVM || removeAgent) {
- removeAgent(attache, nextStatus);
- }
-
+ removeAgent(attache, nextStatus);
//update the DB
if (host != null && transitState) {
disconnectAgent(host, event, _nodeId);