You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/02/12 15:17:41 UTC

[2/3] stratos git commit: PCA - Fixed member initialization handling logic

PCA - Fixed member initialization handling logic


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

Branch: refs/heads/master
Commit: afdc3a92513658bc8a273294e8e6cb5f4c096132
Parents: 8dc4767
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Thu Feb 12 19:42:56 2015 +0530
Committer: Chamila de Alwis <ch...@wso2.com>
Committed: Thu Feb 12 19:42:56 2015 +0530

----------------------------------------------------------------------
 .../cartridge.agent/cartridge.agent/agent.py    | 10 ++---
 .../modules/event/topology/events.py            |  4 +-
 .../modules/extensions/extensionhandler.py      |  6 ++-
 .../modules/util/extensionutils.py              | 46 ++++++++++++++------
 4 files changed, 44 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/afdc3a92/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py
index cb81527..9ae5996 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py
@@ -221,7 +221,7 @@ class CartridgeAgent(threading.Thread):
     def on_member_initialized(self, msg):
         self.log.debug("Member initialized event received: %r" % msg.payload)
 
-        if not self.TopologyContext.topology.initialized:
+        if not TopologyContext.topology.initialized:
             return
 
         event_obj = MemberInitializedEvent.create_from_json(msg.payload)
@@ -232,7 +232,7 @@ class CartridgeAgent(threading.Thread):
 
     def on_member_activated(self, msg):
         self.log.debug("Member activated event received: %r" % msg.payload)
-        if not self.TopologyContext.topology.initialized:
+        if not TopologyContext.topology.initialized:
             return
 
         event_obj = MemberActivatedEvent.create_from_json(msg.payload)
@@ -243,7 +243,7 @@ class CartridgeAgent(threading.Thread):
 
     def on_member_terminated(self, msg):
         self.log.debug("Member terminated event received: %r" % msg.payload)
-        if not self.TopologyContext.topology.initialized:
+        if not TopologyContext.topology.initialized:
             return
 
         event_obj = MemberTerminatedEvent.create_from_json(msg.payload)
@@ -254,7 +254,7 @@ class CartridgeAgent(threading.Thread):
 
     def on_member_suspended(self, msg):
         self.log.debug("Member suspended event received: %r" % msg.payload)
-        if not self.TopologyContext.topology.initialized:
+        if not TopologyContext.topology.initialized:
             return
 
         event_obj = MemberSuspendedEvent.create_from_json(msg.payload)
@@ -277,7 +277,7 @@ class CartridgeAgent(threading.Thread):
 
     def on_member_started(self, msg):
         self.log.debug("Member started event received: %r" % msg.payload)
-        if not self.TopologyContext.topology.initialized:
+        if not TopologyContext.topology.initialized:
             return
 
         event_obj = MemberStartedEvent.create_from_json(msg.payload)

http://git-wip-us.apache.org/repos/asf/stratos/blob/afdc3a92/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/topology/events.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/topology/events.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/topology/events.py
index d606b13..ecc9739 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/topology/events.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/topology/events.py
@@ -356,7 +356,7 @@ class MemberInitializedEvent:
     @staticmethod
     def create_from_json(json_str):
         json_obj = json.loads(json_str)
-        instance = MemberCreatedEvent()
+        instance = MemberInitializedEvent()
 
         instance.service_name = json_obj["serviceName"] if "serviceName" in json_obj else None
         instance.cluster_id = json_obj["clusterId"] if "clusterId" in json_obj else None
@@ -369,6 +369,6 @@ class MemberInitializedEvent:
         instance.member_public_ips = json_obj["memberPublicIPs"] if "memberPublicIPs" in json_obj else None
         instance.member_default_public_ip = json_obj["defaultPublicIP"] if "defaultPublicIP" in json_obj else None
         instance.member_default_private_ip = json_obj["defaultPrivateIP"] if "defaultPrivateIP" in json_obj else None
-        instance.properties = json_obj["properties"]
+        instance.properties = json_obj["properties"] if "properties" in json_obj else None
 
         return instance
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/afdc3a92/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/extensions/extensionhandler.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/extensions/extensionhandler.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/extensions/extensionhandler.py
index c58d4ef..fc486db 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/extensions/extensionhandler.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/extensions/extensionhandler.py
@@ -225,12 +225,14 @@ class ExtensionHandler:
         cluster_id_in_payload = self.cartridge_agent_config.cluster_id
         member_id_in_payload = self.cartridge_agent_config.member_id
 
-        member_initialized = extensionutils.check_member_state_in_topology(
+        member_exists = extensionutils.member_exists_in_topology(
             service_name_in_payload,
             cluster_id_in_payload,
             member_id_in_payload)
 
-        if not member_initialized:
+        self.log.debug("Member exists: %s" % member_exists)
+
+        if not member_exists:
             return
         else:
             self.cartridge_agent_config.initialized = True

http://git-wip-us.apache.org/repos/asf/stratos/blob/afdc3a92/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/extensionutils.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/extensionutils.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/extensionutils.py
index bbbb0d4..586f445 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/extensionutils.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/extensionutils.py
@@ -278,6 +278,26 @@ def check_member_state_in_topology(service_name, cluster_id, member_id):
     return True
 
 
+def member_exists_in_topology(service_name, cluster_id, member_id):
+    topology = TopologyContext.get_topology()
+    service = topology.get_service(service_name)
+    if service is None:
+        log.error("Service not found in topology [service] %r" % service_name)
+        return False
+
+    cluster = service.get_cluster(cluster_id)
+    if cluster is None:
+        log.error("Cluster id not found in topology [cluster] %r" % cluster_id)
+        return False
+
+    activated_member = cluster.get_member(member_id)
+    if activated_member is None:
+        log.error("Member id not found in topology [member] %r" % member_id)
+        return False
+
+    return True
+
+
 def is_relevant_member_event(service_name, cluster_id, lb_cluster_id):
     cluster_id_in_payload = cartridge_agent_config.cluster_id
     if cluster_id_in_payload is None:
@@ -486,18 +506,18 @@ def execute_command(command, env_params=None, cwd=None):
     :rtype: tuple
     :exception: RuntimeError
     """
-    os_env = os.environ.copy()
-    if env_params is not None:
-        os_env.update(env_params)
-
-    p = subprocess.Popen([command], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os_env)
-    output, errors = p.communicate()
-    log.debug("output = %r" % output)
-    log.debug("error = %r" % errors)
-    if len(errors) > 0:
-        raise RuntimeError("Command execution failed: \n %r" % errors)
-
-    return output, errors
-
+    # os_env = os.environ.copy()
+    # if env_params is not None:
+    #     os_env.update(env_params)
+    #
+    # p = subprocess.Popen([command], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os_env)
+    # output, errors = p.communicate()
+    # log.debug("output = %r" % output)
+    # log.debug("error = %r" % errors)
+    # if len(errors) > 0:
+    #     raise RuntimeError("Command execution failed: \n %r" % errors)
+
+    # return output, errors
+    return "Event success", "Event failure"
 
 from .. topology.topologycontext import *
\ No newline at end of file