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/01/02 11:57:17 UTC

stratos git commit: Updating event json parsers and enabling port check logs in python agent

Repository: stratos
Updated Branches:
  refs/heads/master b8630e266 -> af5287b87


Updating event json parsers and enabling port check logs in python agent


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

Branch: refs/heads/master
Commit: af5287b877e2a058898e7bd8775d1061825eb5db
Parents: b8630e2
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Jan 2 16:27:04 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Jan 2 16:27:04 2015 +0530

----------------------------------------------------------------------
 .../cartridgeagent/cartridgeagent/agent.py         |  1 -
 .../modules/config/cartridgeagentconfiguration.py  | 17 ++++++-----------
 .../modules/event/topology/events.py               |  6 +++---
 .../modules/subscriber/eventsubscriber.py          |  3 ---
 .../modules/util/cartridgeagentutils.py            | 15 +++++++--------
 .../cartridgeagent/modules/util/extensionutils.py  |  2 +-
 6 files changed, 17 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/af5287b8/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py
index 3c3aa4b..5b32449 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py
@@ -104,7 +104,6 @@ class CartridgeAgent(threading.Thread):
         if repo_url is None or str(repo_url).strip() == "":
             self.log.info("No artifact repository found")
             CartridgeAgent.extension_handler.on_instance_activated_event()
-
             cartridgeagentpublisher.publish_instance_activated_event()
 
         persistence_mappping_payload = self.cartridge_agent_config.persistence_mappings

http://git-wip-us.apache.org/repos/asf/stratos/blob/af5287b8/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
index 21c3575..bb28ab1 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
@@ -121,7 +121,7 @@ class CartridgeAgentConfiguration:
                 self.service_name = self.read_property(cartridgeagentconstants.SERVICE_NAME)
                 self.cluster_id = self.read_property(cartridgeagentconstants.CLUSTER_ID)
                 self.cluster_instance_id= self.read_property(cartridgeagentconstants.CLUSTER_INSTANCE_ID)
-                self.member_id = self.get_member_id(cartridgeagentconstants.MEMBER_ID)
+                self.member_id = self.read_property(cartridgeagentconstants.MEMBER_ID)
                 self.network_partition_id = self.read_property(cartridgeagentconstants.NETWORK_PARTITION_ID, False)
                 self.partition_id = self.read_property(cartridgeagentconstants.PARTITION_ID, False)
                 self.cartridge_key = self.read_property(cartridgeagentconstants.CARTRIDGE_KEY)
@@ -250,16 +250,10 @@ class CartridgeAgentConfiguration:
             """
             try:
                 member_id = self.read_property(member_id_field)
+                return member_id
             except ParameterNotFoundException:
-                try:
-                    self.log.info("Reading hostname from container")
-                    member_id = socket.gethostname()
-                except:
-                    self.log.exception("Hostname can not be resolved")
-                    member_id = "unknown"
-
-            self.log.debug("MemberId  is taking the value of hostname : [" + member_id + "] ")
-            return member_id
+                self.log.debug("Member id not found")
+                return member_id
 
         def __read_conf_file(self):
             """
@@ -316,8 +310,8 @@ class CartridgeAgentConfiguration:
             """
 
             if self.properties.has_option("agent", property_key):
-                self.log.debug("Has key: %r" % property_key)
                 temp_str = self.properties.get("agent", property_key)
+                self.log.debug("Reading property: %s = %s", property_key, temp_str)
                 if temp_str != "" and temp_str is not None:
                     if str(temp_str).strip().lower() == "null":
                         return ""
@@ -326,6 +320,7 @@ class CartridgeAgentConfiguration:
 
             if property_key in self.payload_params:
                 temp_str = self.payload_params[property_key]
+                self.log.debug("Reading payload parameter: %s = %s", property_key, temp_str)
                 if temp_str != "" and temp_str is not None:
                     if str(temp_str).strip().lower() == "null":
                         return ""

http://git-wip-us.apache.org/repos/asf/stratos/blob/af5287b8/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py
index dcd6f07..acbd914 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py
@@ -172,7 +172,7 @@ class CompleteTopologyEvent:
                 service_str = topology_str["serviceMap"][service_name]
 
                 service_obj = Service(service_name, service_str["serviceType"])
-                service_obj.properties = service_str["properties"]
+                service_obj.properties = service_str["properties"] if "properties" in service_str else None
                 # add ports to port map
                 for port_proxy in service_str["portMap"]:
                     port_str = service_str["portMap"][port_proxy]
@@ -208,8 +208,8 @@ class CompleteTopologyEvent:
                         member_obj = Member(mm_service_name, mm_cluster_id, mm_network_partition_id, mm_partition_id, member_id)
                         member_obj.member_public_ips = member_str["memberPublicIPs"] if "memberPublicIPs" in member_str else None
                         member_obj.status = member_str["status"] if "status" in member_str else None
-                        member_obj.member_private_ips = member_str["memberPrivateIPs"]
-                        member_obj.properties = member_str["properties"]
+                        member_obj.member_private_ips = member_str["memberPrivateIPs"] if "memberPrivateIPs" in json_obj else None
+                        member_obj.properties = member_str["properties"] if "properties" in member_str else None
                         member_obj.lb_cluster_id = member_str["lbClusterId"] if "lbClusterId" in member_str else None
                         member_obj.json_str = member_str
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/af5287b8/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/subscriber/eventsubscriber.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/subscriber/eventsubscriber.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/subscriber/eventsubscriber.py
index bc026dd..4e531d9 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/subscriber/eventsubscriber.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/subscriber/eventsubscriber.py
@@ -34,11 +34,8 @@ class EventSubscriber(threading.Thread):
         self.log = LogFactory().get_log(__name__)
 
         self.__mb_client = None
-
         self.__topic = topic
-
         self.__subscribed = False
-
         self.__ip = ip
         self.__port = port
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/af5287b8/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentutils.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentutils.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentutils.py
index 583cae2..8b3f6b2 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentutils.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentutils.py
@@ -22,12 +22,11 @@ import time
 import socket
 import shutil
 
-#from log import LogFactory
+from log import LogFactory
 
-unpad = lambda s: s[0:-ord(s[-1])]
-
-#log = LogFactory().get_log(__name__)
+log = LogFactory().get_log(__name__)
 
+unpad = lambda s: s[0:-ord(s[-1])]
 current_milli_time = lambda: int(round(time.time() * 1000))
 
 
@@ -103,22 +102,22 @@ def wait_until_ports_active(ip_address, ports, ports_check_timeout=600000):
     if ports_check_timeout is None:
         ports_check_timeout = 1000 * 60 * 10
 
-    #log.debug("Port check timeout: %r" % ports_check_timeout)
+    log.debug("Port check timeout: %r" % ports_check_timeout)
 
     active = False
     start_time = current_milli_time()
     while not active:
-        #log.info("Waiting for ports to be active: [ip] %r [ports] %r" % (ip_address, ports))
+        log.info("Waiting for ports to be active: [ip] %r [ports] %r" % (ip_address, ports))
         active = check_ports_active(ip_address, ports)
         end_time = current_milli_time()
         duration = end_time - start_time
 
         if duration > ports_check_timeout:
+            log.info("Port check timeout reached: [ip] %r [ports] %r [timeout] %r" % (ip_address, ports, ports_check_timeout))
             return
 
         time.sleep(5)
-
-    #log.info("Ports activated: [ip] %r [ports] %r" % (ip_address, ports))
+    log.info("Ports activated: [ip] %r [ports] %r" % (ip_address, ports))
 
 
 def check_ports_active(ip_address, ports):

http://git-wip-us.apache.org/repos/asf/stratos/blob/af5287b8/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py
index 83c827c..8382fea 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py
@@ -333,7 +333,7 @@ def execute_volume_mount_extension(persistance_mappings_payload):
         output, errors = execute_command(command + " " + persistance_mappings_payload)
         log.debug("Volume mount script returned: %r" % output)
     except:
-        log.exception("Could not execute Volume mount extension")
+        log.error("Could not execute volume mount extension")
 
 
 def execute_cleanup_extension():