December 2008 - rhmessaging-commits

rhmessaging commits: r3010 - mgmt/trunk/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2008-12-16 15:07:36 -0500 (Tue, 16 Dec 2008) New Revision: 3010 Modified: mgmt/trunk/cumin/python/cumin/model.py mgmt/trunk/cumin/python/cumin/system.py mgmt/trunk/cumin/python/cumin/system.strings Log: Added free memory and load average to sysimage status box. Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-12-16 19:47:55 UTC (rev 3009) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-12-16 20:07:36 UTC (rev 3010) @@ -691,7 +691,9 @@ class LoadStat(CuminStat): def value_text(self, object): - return "%0.2f" % self.value(object) + value = self.value(object) + text = value and "%0.2f" % value or "" + return text class SystemSlotVisualization(SlotVisualization): def __init__(self, cls, name): Modified: mgmt/trunk/cumin/python/cumin/system.py =================================================================== --- mgmt/trunk/cumin/python/cumin/system.py 2008-12-16 19:47:55 UTC (rev 3009) +++ mgmt/trunk/cumin/python/cumin/system.py 2008-12-16 20:07:36 UTC (rev 3010) @@ -110,8 +110,12 @@ self.set_view_mode(self.view) class SystemStatus(CuminStatus): - pass + def render_mem_free(self, session, system): + return self.app.model.system.memFree.value_html(system) + def render_load_average(self, session, system): + return self.app.model.system.loadAverage1Min.value_html(system) + class SystemStats(Widget): def __init__(self, app, name): super(SystemStats, self).__init__(app, name) Modified: mgmt/trunk/cumin/python/cumin/system.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/system.strings 2008-12-16 19:47:55 UTC (rev 3009) +++ mgmt/trunk/cumin/python/cumin/system.strings 2008-12-16 20:07:36 UTC (rev 3010) @@ -83,6 +83,38 @@ return false; } +[SystemStatus.javascript] +function updateSystemStatus(id, system) { + updateStatus(id, system); + + var s = system.stat; + var sdata = { + "tr": [ + {"td": [s.memFree.value]}, + {"td": [s.loadAverage1Min.value]} + ] + }; + + wooly.doc().elembyid(id).descendant("table.tbody").update(sdata); +} + +[SystemStatus.html] +<div id="{id}" class="CuminStatus {color}"> + <table> + <tr> + <th>Free Memory</th> + <td class="ralign">{mem_free}</td> + </tr> + <tr> + <th>Load Average</th> + <td class="ralign">{load_average}</td> + </tr> + </table> +</div> +<script type="text/javascript"> + cumin.objectListeners["{id}"] = updateSystemStatus +</script> + [SystemStats.html] <table class="twocol"> <tbody>

16 years

1
0
0 / 0

rhmessaging commits: r3009 - mgmt/trunk/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2008-12-16 14:47:55 -0500 (Tue, 16 Dec 2008) New Revision: 3009 Modified: mgmt/trunk/cumin/python/cumin/model.py mgmt/trunk/cumin/python/cumin/system.py mgmt/trunk/cumin/python/cumin/system.strings Log: Added sysimage statistics table. Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-12-16 19:46:53 UTC (rev 3008) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-12-16 19:47:55 UTC (rev 3009) @@ -606,7 +606,7 @@ ("Vacating", "orange"), ("Killing", "blue"), ("Benchmarking", "yellow"), - ("Unknown", "black")] + ("Unknown", "grey")] def get_field_tuples(self, session): return [("name", "Name"), ("machine", "Machine"), ("job_id", "Job")] @@ -619,7 +619,7 @@ for status, color in self.load_colors: if status == activity: return color - return "black" + return "grey" def get_colors(self): return self.load_colors @@ -648,13 +648,28 @@ prop.title = "Architecture" stat = CuminStat(self, "memFree") - stat.title = "Free Memory" + stat.title = "Memory Free" stat.highlow = True - stat = CuminStat(self, "loadAverage1Min") + stat = CuminStat(self, "swapFree") + stat.title = "Swap Free" + + stat = self.LoadStat(self, "loadAverage1Min") stat.title = "1 Minute Load Average" stat.highlow = True + stat = self.LoadStat(self, "loadAverage5Min") + stat.title = "5 Minute Load Average" + + stat = self.LoadStat(self, "loadAverage10Min") + stat.title = "10 Minute Load Average" + + stat = CuminStat(self, "procTotal") + stat.title = "Total processes" + + stat = CuminStat(self, "procRunning") + stat.title = "Running processes" + action = self.SystemSlotVisualization(self, "slots") action.navigable = False @@ -674,6 +689,10 @@ def get_object_name(self, object): return object.nodeName + class LoadStat(CuminStat): + def value_text(self, object): + return "%0.2f" % self.value(object) + class SystemSlotVisualization(SlotVisualization): def __init__(self, cls, name): super(CuminSystem.SystemSlotVisualization, self).__init__(cls, name) @@ -2109,7 +2128,7 @@ for i in range(len(percents)): if work <= percents[i]: return self.load_colors[i][1] - return "black" + return "grey" def get_colors(self): return self.load_colors Modified: mgmt/trunk/cumin/python/cumin/system.py =================================================================== --- mgmt/trunk/cumin/python/cumin/system.py 2008-12-16 19:46:53 UTC (rev 3008) +++ mgmt/trunk/cumin/python/cumin/system.py 2008-12-16 19:47:55 UTC (rev 3009) @@ -118,6 +118,8 @@ self.grid = self.SlotUtilizationGrid(app, "slot_grid") self.add_child(self.grid) + + self.add_child(StatSet(app, "stats", "general")) chart = StatValueChart(app, "freemem") chart.stats = ("memFree",) @@ -189,6 +191,10 @@ self.__tabs.add_tab(SystemServices(app, "services")) self.__tabs.add_tab(CuminDetails(app, "details")) + def render_script(self, session, system): + data = "model.xml?class=system;id=%i" % system.id + return "wooly.setIntervalUpdate('%s', updateSystem, 3000)" % data + from job import JobTab class SystemJobSet(JobTab): Modified: mgmt/trunk/cumin/python/cumin/system.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/system.strings 2008-12-16 19:46:53 UTC (rev 3008) +++ mgmt/trunk/cumin/python/cumin/system.strings 2008-12-16 19:47:55 UTC (rev 3009) @@ -88,6 +88,9 @@ <tbody> <tr> <td> + <h2>Memory/Load</h2> + {stats} + {slot_grid} </td> <td> @@ -101,7 +104,22 @@ var show_slot_job_url = "{slot_job_url}"; </script> +[SystemView.javascript] +function updateSystem(data) { + var model = data.objectify(); + var systems = model.system; + var system; + for (var key in systems) { + system = systems[key]; + break; + } + + cumin.runModelListeners(model); + cumin.runObjectListeners(system); +} + + [SystemJobSet.html] <div class="rfloat">{phase}</div> <form id="{id}" style="clear:right;" method="post" action="?">

16 years

1
0
0 / 0

rhmessaging commits: r3008 - mgmt/trunk/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2008-12-16 14:46:53 -0500 (Tue, 16 Dec 2008) New Revision: 3008 Modified: mgmt/trunk/cumin/python/cumin/stat.strings Log: Changed color of "Unknown" slot status to grey. Modified: mgmt/trunk/cumin/python/cumin/stat.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/stat.strings 2008-12-16 16:53:21 UTC (rev 3007) +++ mgmt/trunk/cumin/python/cumin/stat.strings 2008-12-16 19:46:53 UTC (rev 3008) @@ -240,6 +240,7 @@ .btn.red { background: #fcc; } .btn.orange { background: #ffbb5e; } .btn.black { background: #444; } +.btn.grey { background: #ccc; } .btn.clear { background: white; } .btn.green1 { background: #9f9; } .btn.green2 { background: #6c6; }

16 years

1
0
0 / 0

rhmessaging commits: r3007 - mgmt/trunk/mint/python/mint.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-12-16 11:53:21 -0500 (Tue, 16 Dec 2008) New Revision: 3007 Modified: mgmt/trunk/mint/python/mint/tools.py Log: Prevent double logging Modified: mgmt/trunk/mint/python/mint/tools.py =================================================================== --- mgmt/trunk/mint/python/mint/tools.py 2008-12-16 16:50:39 UTC (rev 3006) +++ mgmt/trunk/mint/python/mint/tools.py 2008-12-16 16:53:21 UTC (rev 3007) @@ -64,13 +64,14 @@ sys.exit(0) level = opts.get("log-level", "warn") + + if "debug" in opts: + level = "debug" + file = opts.get("log-file", sys.stderr) - + enable_logging("mint", level, file) - if "debug" in opts: - enable_logging("mint", "debug", sys.stderr) - data = opts.get("data", "postgresql://cumin@localhost/cumin") freq = int(opts.get("expire-frequency", 600)) threshold = int(opts.get("expire-threshold", 24 * 3600))

16 years

1
0
0 / 0

rhmessaging commits: r3006 - mgmt/trunk/mint/python/mint.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-12-16 11:50:39 -0500 (Tue, 16 Dec 2008) New Revision: 3006 Modified: mgmt/trunk/mint/python/mint/update.py Log: Fix a logging error (2) Modified: mgmt/trunk/mint/python/mint/update.py =================================================================== --- mgmt/trunk/mint/python/mint/update.py 2008-12-16 16:39:07 UTC (rev 3005) +++ mgmt/trunk/mint/python/mint/update.py 2008-12-16 16:50:39 UTC (rev 3006) @@ -104,11 +104,10 @@ self.priority = 0 def __repr__(self): - return "%s(%s, %s, %s, %i)" % (self.__class__.__name__, - self.broker, - self.object and self.object.getClassKey(), - self.object, - self.priority) + return "%s(%s, %s, %i)" % (self.__class__.__name__, + self.broker, + self.object, + self.priority) def getClass(self): # XXX this is unfortunate

16 years

1
0
0 / 0

rhmessaging commits: r3005 - mgmt/trunk/mint/python/mint.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-12-16 11:39:07 -0500 (Tue, 16 Dec 2008) New Revision: 3005 Modified: mgmt/trunk/mint/python/mint/__init__.py Log: Fix a logging error Modified: mgmt/trunk/mint/python/mint/__init__.py =================================================================== --- mgmt/trunk/mint/python/mint/__init__.py 2008-12-16 14:44:41 UTC (rev 3004) +++ mgmt/trunk/mint/python/mint/__init__.py 2008-12-16 16:39:07 UTC (rev 3005) @@ -32,7 +32,7 @@ pass # get better thread switching performance -sys.setcheckinterval(25) +sys.setcheckinterval(200) Broker.sqlmeta.addColumn(ForeignKey("BrokerRegistration", @@ -353,9 +353,6 @@ self.outstandingMethodCalls = dict() - if self.debug: - log.setLevel(logging.DEBUG) - def lock(self): self.__lock.acquire()

16 years

1
0
0 / 0

rhmessaging commits: r3004 - mgmt/trunk/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2008-12-16 09:44:41 -0500 (Tue, 16 Dec 2008) New Revision: 3004 Modified: mgmt/trunk/cumin/python/cumin/model.py Log: Avoid exception if GetAd returns without a ["JobAd"] entry. Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-12-15 22:40:16 UTC (rev 3003) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-12-16 14:44:41 UTC (rev 3004) @@ -2448,8 +2448,11 @@ self.got_data = False def completion(status, job_ads): - self.job_ads = job_ads["JobAd"] - self.got_data = True + try: + self.job_ads = job_ads["JobAd"] + self.got_data = True + except: + pass def predicate(): return self.got_data

16 years

1
0
0 / 0

rhmessaging commits: r3003 - in mgmt/trunk: mint/python/mint and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-12-15 17:40:16 -0500 (Mon, 15 Dec 2008) New Revision: 3003 Modified: mgmt/trunk/cumin/python/cumin/tools.py mgmt/trunk/mint/python/mint/__init__.py mgmt/trunk/mint/python/mint/tools.py mgmt/trunk/mint/python/mint/update.py Log: Add opt-in psyco native compilation. Add some logic to the update processing thread to yield if the work queue is deep enough. Modified: mgmt/trunk/cumin/python/cumin/tools.py =================================================================== --- mgmt/trunk/cumin/python/cumin/tools.py 2008-12-15 19:42:27 UTC (rev 3002) +++ mgmt/trunk/cumin/python/cumin/tools.py 2008-12-15 22:40:16 UTC (rev 3003) @@ -59,6 +59,12 @@ self.config.init() + try: + import psyco + psyco.full() + except ImportError: + pass + def run(self): try: opts, args = self.parse(sys.argv) Modified: mgmt/trunk/mint/python/mint/__init__.py =================================================================== --- mgmt/trunk/mint/python/mint/__init__.py 2008-12-15 19:42:27 UTC (rev 3002) +++ mgmt/trunk/mint/python/mint/__init__.py 2008-12-15 22:40:16 UTC (rev 3003) @@ -32,7 +32,7 @@ pass # get better thread switching performance -sys.setcheckinterval(50) +sys.setcheckinterval(25) Broker.sqlmeta.addColumn(ForeignKey("BrokerRegistration", Modified: mgmt/trunk/mint/python/mint/tools.py =================================================================== --- mgmt/trunk/mint/python/mint/tools.py 2008-12-15 19:42:27 UTC (rev 3002) +++ mgmt/trunk/mint/python/mint/tools.py 2008-12-15 22:40:16 UTC (rev 3003) @@ -45,6 +45,12 @@ #self.config.init() + try: + import psyco + psyco.full() + except ImportError: + pass + def run(self): try: opts, args = self.parse(sys.argv) Modified: mgmt/trunk/mint/python/mint/update.py =================================================================== --- mgmt/trunk/mint/python/mint/update.py 2008-12-15 19:42:27 UTC (rev 3002) +++ mgmt/trunk/mint/python/mint/update.py 2008-12-15 22:40:16 UTC (rev 3003) @@ -9,7 +9,7 @@ from traceback import print_exc from qpid.datatypes import UUID from mint.schema import * -from time import clock +from time import clock, sleep from sql import * from collections import deque from util import * @@ -35,6 +35,10 @@ except Full: log.exception("Queue is full") + if self.updates.qsize() > 1000: + # This is an attempt to yield + sleep(0.1) + def run(self): conn = self.model.dbConn.getConnection()

16 years

1
0
0 / 0

rhmessaging commits: r3002 - in mgmt/trunk/mint: xml and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-12-15 14:42:27 -0500 (Mon, 15 Dec 2008) New Revision: 3002 Modified: mgmt/trunk/mint/python/mint/schema.py mgmt/trunk/mint/xml/Makefile Log: Update schema to pickup the module capitalization changes; update qpid svn urls (remove incubator) Modified: mgmt/trunk/mint/python/mint/schema.py =================================================================== --- mgmt/trunk/mint/python/mint/schema.py 2008-12-15 18:46:44 UTC (rev 3001) +++ mgmt/trunk/mint/python/mint/schema.py 2008-12-15 19:42:27 UTC (rev 3002) @@ -1397,16 +1397,16 @@ Master.sqlmeta.addJoin(SQLMultipleJoin('MasterStats', joinMethodName='stats')) -classToSchemaNameMap['Acl'] = 'acl' -schemaNameToClassMap['acl'] = Acl +classToSchemaNameMap['Acl'] = 'Acl' +schemaNameToClassMap['Acl'] = Acl Broker.sqlmeta.addJoin(SQLMultipleJoin('Acl', joinMethodName='acls')) Acl.sqlmeta.addJoin(SQLMultipleJoin('AclStats', joinMethodName='stats')) -classToSchemaNameMap['Cluster'] = 'cluster' -schemaNameToClassMap['cluster'] = Cluster +classToSchemaNameMap['Cluster'] = 'Cluster' +schemaNameToClassMap['Cluster'] = Cluster Broker.sqlmeta.addJoin(SQLMultipleJoin('Cluster', joinMethodName='clusters')) Modified: mgmt/trunk/mint/xml/Makefile =================================================================== --- mgmt/trunk/mint/xml/Makefile 2008-12-15 18:46:44 UTC (rev 3001) +++ mgmt/trunk/mint/xml/Makefile 2008-12-15 19:42:27 UTC (rev 3002) @@ -8,16 +8,16 @@ rm -f ${FILES} qpid.xml: - svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/specs/managemen... qpid.xml + svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/specs/management-schema.xml qpid.xml qpid-store.xml: svn export http://anonsvn.jboss.org/repos/rhmessaging/store/trunk/cpp/lib/qmf-schema... qpid-store.xml qpid-acl.xml: - svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/cpp/src/qpid/ac... qpid-acl.xml + svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/src/qpid/acl/manageme... qpid-acl.xml qpid-cluster.xml: - svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/cpp/src/qpid/cl... qpid-cluster.xml + svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/src/qpid/cluster/mana... qpid-cluster.xml condor.xml: wget "http://git.et.redhat.com/?p=mrg-grid.git;a=blob_plain;f=src/management/co..." -O condor.xml

16 years

1
0
0 / 0

rhmessaging commits: r3001 - mgmt/trunk/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-12-15 13:46:44 -0500 (Mon, 15 Dec 2008) New Revision: 3001 Modified: mgmt/trunk/cumin/python/cumin/tools.py Log: Try really hard to make the mint subprocess die Modified: mgmt/trunk/cumin/python/cumin/tools.py =================================================================== --- mgmt/trunk/cumin/python/cumin/tools.py 2008-12-15 15:46:40 UTC (rev 3000) +++ mgmt/trunk/cumin/python/cumin/tools.py 2008-12-15 18:46:44 UTC (rev 3001) @@ -7,6 +7,7 @@ from getpass import getpass from psycopg2 import IntegrityError from subprocess import Popen +from time import sleep from util import * from cumin import Cumin, CuminServer, CuminConfig @@ -443,21 +444,39 @@ opt = CommandOption(self, "ssl") opt.description = "Serve web pages using SSL" - def start_mint_process(self, config, opts): - args = ["mint-server", - "--data", self.config.data, - "--log-file", self.config.log_file, - "--log-level", self.config.log_level, - "--expire-frequency", str(self.config.expire_frequency), - "--expire-threshold", str(self.config.expire_threshold)] + class MintProcess(object): + def __init__(self): + self.proc = None - if "debug" in opts or config.debug: - args.append("--debug") + def start(self, config, opts): + args = ["mint-server", + "--data", config.data, + "--log-file", config.log_file, + "--log-level", config.log_level, + "--expire-frequency", str(config.expire_frequency), + "--expire-threshold", str(config.expire_threshold)] - pop = Popen(args) + if "debug" in opts or config.debug: + args.append("--debug") - return pop.pid + self.proc = Popen(args) + def stop(self): + os.kill(self.proc.pid, signal.SIGTERM) + + for i in range(10): + code = self.proc.poll() + + if code is not None: + return + + sleep(1) + + os.kill(self.proc.pid, signal.SIGKILL) + + log.warn("Mint subprocess %i wouldn't go gracefully", + self.proc.pid) + def do_run(self, opts, args): self.config.load_dict(opts) @@ -494,25 +513,23 @@ log.error("SSL key file '%s' not found" % kpath) sys.exit(1) - mint_pid = None + mint_proc = self.MintProcess() try: - app.start() - try: - mint_pid = self.start_mint_process(self.config, opts) + mint_proc.start(self.config, opts) except: log.exception("Failed starting mint process") + app.start() + try: server.start() finally: server.stop() finally: - if mint_pid is not None: - os.kill(mint_pid, signal.SIGTERM) - app.stop() + mint_proc.stop() class CuminTestTool(BaseCuminTool): def __init__(self, name):

16 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits December 2008