You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by me...@apache.org on 2015/02/27 02:22:26 UTC

stratos git commit: fixing issue with agent not going active because incorrect checkTopologyConsistency, reverted cionsistency check to previously used check

Repository: stratos
Updated Branches:
  refs/heads/master fc54633fd -> 41bb653e2


fixing issue with agent not going active because incorrect checkTopologyConsistency, reverted cionsistency check to previously used check


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/41bb653e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/41bb653e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/41bb653e

Branch: refs/heads/master
Commit: 41bb653e2506b74967fc14288338d38e97ea2364
Parents: fc54633
Author: Martin Eppel <me...@cisco..com>
Authored: Thu Feb 26 17:21:56 2015 -0800
Committer: Martin Eppel <me...@cisco..com>
Committed: Thu Feb 26 17:21:56 2015 -0800

----------------------------------------------------------------------
 .../apache/stratos/cartridge/agent/util/ExtensionUtils.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/41bb653e/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
index f395af7..306f965 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
@@ -497,9 +497,11 @@ public class ExtensionUtils {
     public static boolean checkTopologyConsistency(String serviceName, String clusterId, String memberId) {
 
         Member activatedMember = getMemberFromTopology(serviceName, clusterId, memberId);
-        if (activatedMember.getStatus() != MemberStatus.Initialized) {
+        // this doesn't work for all events: if (activatedMember.getStatus() != MemberStatus.Initialized) {
+        if (activatedMember == null) {
             if (log.isErrorEnabled()) {
-                log.error(String.format("Member found in topology, but not in initialized state [member] %s", memberId));
+                //log.error(String.format("Member found in topology, but not in initialized state [member] %s", memberId));
+            	log.error(String.format("Member not found in topology [member] %s %s %s ", memberId, clusterId, serviceName));
             }
             return false;
         }