[rhmessaging-commits] rhmessaging commits: r4299 - mgmt/newdata/mint/python/mint.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2010-09-16 11:28:26 -0400 (Thu, 16 Sep 2010)
New Revision: 4299

Modified:
   mgmt/newdata/mint/python/mint/main.py
   mgmt/newdata/mint/python/mint/session.py
Log:
Scale enhancement from recent analysis; speed up the path to inject updates

Modified: mgmt/newdata/mint/python/mint/main.py
===================================================================
--- mgmt/newdata/mint/python/mint/main.py	2010-09-16 14:31:37 UTC (rev 4298)
+++ mgmt/newdata/mint/python/mint/main.py	2010-09-16 15:28:26 UTC (rev 4299)
@@ -17,7 +17,6 @@
         self.session = MintSession(self, broker_uris)
         self.database = MintDatabase(self, database_dsn)
 
-        self.update_enabled = True
         self.update_thread = UpdateThread(self)
 
         self.expire_enabled = True
@@ -43,7 +42,6 @@
         def state(cond):
             return cond and "enabled" or "disabled"
 
-        log.info("Updates are %s", state(self.update_enabled))
         log.info("Expiration is %s", state(self.expire_enabled))
         log.info("Vacuum is %s", state(self.vacuum_enabled))
 
@@ -58,11 +56,10 @@
     def start(self):
         log.info("Starting %s", self)
 
+        self.update_thread.start()
+
         self.session.start()
 
-        if self.update_enabled:
-            self.update_thread.start()
-
         if self.expire_enabled:
             self.expire_thread.start()
 

Modified: mgmt/newdata/mint/python/mint/session.py
===================================================================
--- mgmt/newdata/mint/python/mint/session.py	2010-09-16 14:31:37 UTC (rev 4298)
+++ mgmt/newdata/mint/python/mint/session.py	2010-09-16 15:28:26 UTC (rev 4299)
@@ -35,7 +35,7 @@
 
         self.qmf_session = Session(MintConsole(self.app.model),
                                    manageConnections=True,
-                                   rcvObjects=self.app.update_enabled,
+                                   rcvObjects=True,
                                    rcvEvents=False,
                                    rcvHeartbeats=True,
                                    userBindings=True)
@@ -82,9 +82,6 @@
     def delAgent(self, qmf_agent):
         self.model.print_event(3, "Deleting %s", qmf_agent)
 
-        if not self.model.app.update_thread.isAlive():
-            return
-
         up = AgentDelete(self.model, qmf_agent)
         self.model.app.update_thread.enqueue(up)
 
@@ -92,9 +89,6 @@
         message = "Heartbeat from %s at %s"
         self.model.print_event(5, message, qmf_agent, timestamp)
 
-        if not self.model.app.update_thread.isAlive():
-            return
-
         up = AgentUpdate(self.model, qmf_agent)
         self.model.app.update_thread.enqueue(up)
 
@@ -105,16 +99,10 @@
         self.model.print_event(2, "New class %s", classKey)
 
     def objectProps(self, broker, qmf_object):
-        if not self.model.app.update_thread.isAlive():
-            return
-
         up = ObjectUpdate(self.model, qmf_object)
         self.model.app.update_thread.enqueue(up)
 
     def objectStats(self, broker, qmf_object):
-        if not self.model.app.update_thread.isAlive():
-            return
-
         up = ObjectUpdate(self.model, qmf_object)
         self.model.app.update_thread.enqueue(up)