cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/4.2 to 6766c01
Date Wed, 07 Aug 2013 21:42:23 GMT
Updated Branches:
  refs/heads/4.2 bdd62132e -> 6766c01fc


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/6766c01f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6766c01f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6766c01f

Branch: refs/heads/4.2
Commit: 6766c01fc67d322d9c80461bbf84290bfcd5b6e7
Parents: bdd6213
Author: Edison Su <sudison@gmail.com>
Authored: Wed Aug 7 14:41:36 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Aug 7 14:42:04 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/6766c01f/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/6766c01f/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 d0016a1..1ec48e6 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java
@@ -31,9 +31,11 @@ import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VMInstanceVO;
 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/6766c01f/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 519b3cf..572f78b 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -850,11 +850,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);


Mime
View raw message