rhmessaging commits: r3030 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-12-18 18:24:18 -0500 (Thu, 18 Dec 2008)
New Revision: 3030
Modified:
mgmt/trunk/cumin/python/cumin/job.py
mgmt/trunk/cumin/python/cumin/job.strings
Log:
Make job output area non-disabled so copy works.
Change the "loading..." message if there are no valid file names in the job ad.
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 22:38:27 UTC (rev 3029)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 23:24:18 UTC (rev 3030)
@@ -887,6 +887,10 @@
return super(JobOutput, self).render(session, *args)
+ def render_loading(self, session, *args):
+ file = self.which_file.get_current_file_name(session)
+ return file and "loading..." or "Output, Error, and UserLog file names are invalid."
+
def get_file_args(self, session):
first_last = self.first_last.get(session)
if first_last == "t":
@@ -903,10 +907,11 @@
job = self.parent.frame.get_args(session)[0]
if job:
file, start, end = self.parent.get_file_args(session)
- fl = self.parent.first_last.get(session)
- args = "%s&%i&%i&%s" % (file, start, end, fl)
- args = escape_amp(args)
- return "call.xml?class=job;id=%i;method=fetch;xargs=%s" % (job.id, args)
+ if file:
+ fl = self.parent.first_last.get(session)
+ args = "%s&%i&%i&%s" % (file, start, end, fl)
+ args = escape_amp(args)
+ return "call.xml?class=job;id=%i;method=fetch;xargs=%s" % (job.id, args)
def do_render(self, session):
return self.render_script(session)
Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings 2008-12-18 22:38:27 UTC (rev 3029)
+++ mgmt/trunk/cumin/python/cumin/job.strings 2008-12-18 23:24:18 UTC (rev 3030)
@@ -385,8 +385,8 @@
{file}
</div>
<div class="sactions refresh_info">{refresh} <h2>Last refresh was at <span id="out_time"></span></h2></div>
-<div><textarea name="job_output" id="job_output" disabled="disabled" rows="20" cols="80">
-loading...{job_output}
+<div><textarea name="job_output" id="job_output" rows="20" cols="80">
+{loading}{job_output}
</textarea>
{hidden_inputs}</div>
</form>
15 years, 5 months
rhmessaging commits: r3029 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-18 17:38:27 -0500 (Thu, 18 Dec 2008)
New Revision: 3029
Modified:
mgmt/trunk/cumin/python/cumin/job.py
Log:
Correct a query criterion
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 21:58:24 UTC (rev 3028)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 22:38:27 UTC (rev 3029)
@@ -578,7 +578,7 @@
"""
def get_sql_values(self, session, job):
- return {"id": job.id}
+ return {"id": "%i.%i" % (job.ClusterId, job.ProcId)}
class JobAdsSet(PropertySet):
def __init__(self, app, name):
15 years, 5 months
rhmessaging commits: r3028 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-18 16:58:24 -0500 (Thu, 18 Dec 2008)
New Revision: 3028
Modified:
mgmt/trunk/cumin/python/cumin/job.py
mgmt/trunk/cumin/python/cumin/job.strings
Log:
Fix the pool part of the links to top jobs
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 21:52:54 UTC (rev 3027)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 21:58:24 UTC (rev 3028)
@@ -217,10 +217,15 @@
return "Name"
def render_content(self, session, data):
+ pool = Identifiable(data["pool"])
job = Identifiable(data["id"])
- href = self.page.main.pool.job.get_href(session, job)
- return fmt_link(href, fmt_shorten(data["name"]))
+ branch = session.branch()
+ self.page.main.pool.object.set(session, pool)
+ self.page.main.pool.job.object.set(session, job)
+ self.page.main.pool.job.show(session)
+ return fmt_link(branch.marshal(), fmt_shorten(data["name"]))
+
class DurationColumn(TopTableColumn):
def render_title(self, session, data):
return "Duration"
Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings 2008-12-18 21:52:54 UTC (rev 3027)
+++ mgmt/trunk/cumin/python/cumin/job.strings 2008-12-18 21:58:24 UTC (rev 3028)
@@ -48,8 +48,10 @@
select
j.id,
j.custom_id as name,
- j.q_date
+ j.q_date,
+ s.pool
from job as j
+join scheduler s on s.id = j.scheduler_id
where j.job_status = 2
and j.qmf_update_time > now() - interval '60 seconds'
order by j.q_date asc
15 years, 5 months
rhmessaging commits: r3027 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: nunofsantos
Date: 2008-12-18 16:52:54 -0500 (Thu, 18 Dec 2008)
New Revision: 3027
Modified:
mgmt/trunk/mint/python/mint/update.py
Log:
drop updates for Jobs that are older then the expiration threshold, since they would be deleted anyway in the next run of the db expiration thread
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-12-18 19:28:25 UTC (rev 3026)
+++ mgmt/trunk/mint/python/mint/update.py 2008-12-18 21:52:54 UTC (rev 3027)
@@ -213,6 +213,14 @@
timestamps = self.object.getTimestamps()
self.processTimestamp("qmfUpdateTime", timestamps[0], attrs)
+
+ if cls is Job and attrs["qmfUpdateTime"] < datetime.now() - timedelta(seconds=thread.model.dbExpireThread.threshold):
+ # drop updates for Jobs that are older then the expiration threshold,
+ # since they would be deleted anyway in the next run of the db expiration thread
+ log.debug("Property update is older than expiration threshold; skipping it")
+ thread.dropCount += 1
+ return
+
self.processTimestamp("qmfCreateTime", timestamps[1], attrs)
if timestamps[2] != 0:
@@ -278,7 +286,7 @@
op = SqlUpdate(cls, attrs)
op.execute(cursor, attrs)
- assert cursor.rowcount == 1
+ #assert cursor.rowcount == 1
try:
orphans = self.broker.orphans.pop(oid)
@@ -336,7 +344,7 @@
t = datetime.fromtimestamp(timestamps[0] / 1000000000)
if t < tnow - timedelta(seconds=30):
- log.debug("Update is %i seconds old; skipping it", (tnow -t).seconds)
+ log.debug("Update is %i seconds old; skipping it", (tnow - t).seconds)
thread.dropCount += 1
return
15 years, 5 months
rhmessaging commits: r3026 - in mgmt/trunk/cumin: resources and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-18 14:28:25 -0500 (Thu, 18 Dec 2008)
New Revision: 3026
Added:
mgmt/trunk/cumin/resources/mrg-banner.png
Modified:
mgmt/trunk/cumin/python/cumin/page.strings
Log:
Add some branding
Modified: mgmt/trunk/cumin/python/cumin/page.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.strings 2008-12-18 18:30:39 UTC (rev 3025)
+++ mgmt/trunk/cumin/python/cumin/page.strings 2008-12-18 19:28:25 UTC (rev 3026)
@@ -1,10 +1,10 @@
[MainFrame.css]
#head {
padding: 0;
- background-color: #666;
border-bottom: 1px solid #999;
border-top: 3px solid #000;
color: #ddd;
+ background: #666 url("resource?name=mrg-banner.png") no-repeat scroll center;
}
#head a {
Added: mgmt/trunk/cumin/resources/mrg-banner.png
===================================================================
(Binary files differ)
Property changes on: mgmt/trunk/cumin/resources/mrg-banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 5 months
rhmessaging commits: r3025 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-18 13:30:39 -0500 (Thu, 18 Dec 2008)
New Revision: 3025
Modified:
mgmt/trunk/mint/python/mint/update.py
Log:
Try to avoid conversion error
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-12-18 16:05:58 UTC (rev 3024)
+++ mgmt/trunk/mint/python/mint/update.py 2008-12-18 18:30:39 UTC (rev 3025)
@@ -118,8 +118,8 @@
def __repr__(self):
return "%s(%s, %s, %i)" % (self.__class__.__name__,
- self.broker,
- self.object,
+ str(self.broker),
+ str(self.object),
self.priority)
def getClass(self):
15 years, 5 months
rhmessaging commits: r3024 - in mgmt/trunk: mint/python/mint and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-18 11:05:58 -0500 (Thu, 18 Dec 2008)
New Revision: 3024
Modified:
mgmt/trunk/cumin/python/cumin/model.py
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Update the schema to include the distro property
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-12-18 15:58:17 UTC (rev 3023)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-12-18 16:05:58 UTC (rev 3024)
@@ -647,6 +647,9 @@
prop = CuminProperty(self, "machine")
prop.title = "Architecture"
+ prop = CuminProperty(self, "distro")
+ prop.title = "Distribution"
+
stat = CuminStat(self, "memFree")
stat.title = "Memory Free"
stat.highlow = True
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-12-18 15:58:17 UTC (rev 3023)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-12-18 16:05:58 UTC (rev 3024)
@@ -1324,6 +1324,7 @@
release = StringCol(length=1000, default=None)
version = StringCol(length=1000, default=None)
machine = StringCol(length=1000, default=None)
+ distro = StringCol(length=1000, default=None)
memTotal = BigIntCol(default=None)
swapTotal = BigIntCol(default=None)
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-12-18 15:58:17 UTC (rev 3023)
+++ mgmt/trunk/mint/sql/schema.sql 2008-12-18 16:05:58 UTC (rev 3024)
@@ -895,6 +895,7 @@
release VARCHAR(1000),
version VARCHAR(1000),
machine VARCHAR(1000),
+ distro VARCHAR(1000),
mem_total BIGINT,
swap_total BIGINT
);
15 years, 5 months
rhmessaging commits: r3023 - in mgmt/trunk/mint: sql and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-18 10:58:17 -0500 (Thu, 18 Dec 2008)
New Revision: 3023
Modified:
mgmt/trunk/mint/python/mint/__init__.py
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/python/mint/schemaparser.py
mgmt/trunk/mint/sql/schema.sql
Log:
Use BigIntCol for count32 and mma32, since those types are unsigned
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-12-18 15:03:14 UTC (rev 3022)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-12-18 15:58:17 UTC (rev 3023)
@@ -535,12 +535,12 @@
if not self.updateObjects:
return
+ if record.getClassKey().getClassName() == "job":
+ return
+
mbroker = self.getMintBrokerByQmfBroker(broker)
up = update.StatisticUpdate(self, mbroker, record)
- if record.getClassKey().getClassName() == "job":
- up.priority = 1
-
self.updateThread.enqueue(up)
def event(self, broker, event):
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-12-18 15:03:14 UTC (rev 3022)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-12-18 15:58:17 UTC (rev 3023)
@@ -638,15 +638,15 @@
qmfUpdateTime = TimestampCol(default=None)
store = ForeignKey('Store', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- tplTransactionDepth = IntCol(default=None)
- tplTransactionDepthLow = IntCol(default=None)
- tplTransactionDepthHigh = IntCol(default=None)
+ tplTransactionDepth = BigIntCol(default=None)
+ tplTransactionDepthLow = BigIntCol(default=None)
+ tplTransactionDepthHigh = BigIntCol(default=None)
tplTxnPrepares = BigIntCol(default=None)
tplTxnCommits = BigIntCol(default=None)
tplTxnAborts = BigIntCol(default=None)
- tplOutstandingAIOs = IntCol(default=None)
- tplOutstandingAIOsLow = IntCol(default=None)
- tplOutstandingAIOsHigh = IntCol(default=None)
+ tplOutstandingAIOs = BigIntCol(default=None)
+ tplOutstandingAIOsLow = BigIntCol(default=None)
+ tplOutstandingAIOsHigh = BigIntCol(default=None)
@@ -697,34 +697,34 @@
qmfUpdateTime = TimestampCol(default=None)
journal = ForeignKey('Journal', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- recordDepth = IntCol(default=None)
- recordDepthLow = IntCol(default=None)
- recordDepthHigh = IntCol(default=None)
+ recordDepth = BigIntCol(default=None)
+ recordDepthLow = BigIntCol(default=None)
+ recordDepthHigh = BigIntCol(default=None)
enqueues = BigIntCol(default=None)
dequeues = BigIntCol(default=None)
txnEnqueues = BigIntCol(default=None)
txnDequeues = BigIntCol(default=None)
txnCommits = BigIntCol(default=None)
txnAborts = BigIntCol(default=None)
- outstandingAIOs = IntCol(default=None)
- outstandingAIOsLow = IntCol(default=None)
- outstandingAIOsHigh = IntCol(default=None)
- freeFileCount = IntCol(default=None)
- freeFileCountLow = IntCol(default=None)
- freeFileCountHigh = IntCol(default=None)
- availableFileCount = IntCol(default=None)
- availableFileCountLow = IntCol(default=None)
- availableFileCountHigh = IntCol(default=None)
+ outstandingAIOs = BigIntCol(default=None)
+ outstandingAIOsLow = BigIntCol(default=None)
+ outstandingAIOsHigh = BigIntCol(default=None)
+ freeFileCount = BigIntCol(default=None)
+ freeFileCountLow = BigIntCol(default=None)
+ freeFileCountHigh = BigIntCol(default=None)
+ availableFileCount = BigIntCol(default=None)
+ availableFileCountLow = BigIntCol(default=None)
+ availableFileCountHigh = BigIntCol(default=None)
writeWaitFailures = BigIntCol(default=None)
writeBusyFailures = BigIntCol(default=None)
readRecordCount = BigIntCol(default=None)
readBusyFailures = BigIntCol(default=None)
- writePageCacheDepth = IntCol(default=None)
- writePageCacheDepthLow = IntCol(default=None)
- writePageCacheDepthHigh = IntCol(default=None)
- readPageCacheDepth = IntCol(default=None)
- readPageCacheDepthLow = IntCol(default=None)
- readPageCacheDepthHigh = IntCol(default=None)
+ writePageCacheDepth = BigIntCol(default=None)
+ writePageCacheDepthLow = BigIntCol(default=None)
+ writePageCacheDepthHigh = BigIntCol(default=None)
+ readPageCacheDepth = BigIntCol(default=None)
+ readPageCacheDepthLow = BigIntCol(default=None)
+ readPageCacheDepthHigh = BigIntCol(default=None)
@@ -965,23 +965,23 @@
msgTxnDequeues = BigIntCol(default=None)
msgPersistEnqueues = BigIntCol(default=None)
msgPersistDequeues = BigIntCol(default=None)
- msgDepth = IntCol(default=None)
- byteDepth = IntCol(default=None)
+ msgDepth = BigIntCol(default=None)
+ byteDepth = BigIntCol(default=None)
byteTotalEnqueues = BigIntCol(default=None)
byteTotalDequeues = BigIntCol(default=None)
byteTxnEnqueues = BigIntCol(default=None)
byteTxnDequeues = BigIntCol(default=None)
bytePersistEnqueues = BigIntCol(default=None)
bytePersistDequeues = BigIntCol(default=None)
- consumerCount = IntCol(default=None)
- consumerCountLow = IntCol(default=None)
- consumerCountHigh = IntCol(default=None)
- bindingCount = IntCol(default=None)
- bindingCountLow = IntCol(default=None)
- bindingCountHigh = IntCol(default=None)
- unackedMessages = IntCol(default=None)
- unackedMessagesLow = IntCol(default=None)
- unackedMessagesHigh = IntCol(default=None)
+ consumerCount = BigIntCol(default=None)
+ consumerCountLow = BigIntCol(default=None)
+ consumerCountHigh = BigIntCol(default=None)
+ bindingCount = BigIntCol(default=None)
+ bindingCountLow = BigIntCol(default=None)
+ bindingCountHigh = BigIntCol(default=None)
+ unackedMessages = BigIntCol(default=None)
+ unackedMessagesLow = BigIntCol(default=None)
+ unackedMessagesHigh = BigIntCol(default=None)
messageLatencyMin = BigIntCol(default=None)
messageLatencyMax = BigIntCol(default=None)
messageLatencyAverage = BigIntCol(default=None)
@@ -1021,12 +1021,12 @@
qmfUpdateTime = TimestampCol(default=None)
exchange = ForeignKey('Exchange', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- producerCount = IntCol(default=None)
- producerCountLow = IntCol(default=None)
- producerCountHigh = IntCol(default=None)
- bindingCount = IntCol(default=None)
- bindingCountLow = IntCol(default=None)
- bindingCountHigh = IntCol(default=None)
+ producerCount = BigIntCol(default=None)
+ producerCountLow = BigIntCol(default=None)
+ producerCountHigh = BigIntCol(default=None)
+ bindingCount = BigIntCol(default=None)
+ bindingCountLow = BigIntCol(default=None)
+ bindingCountHigh = BigIntCol(default=None)
msgReceives = BigIntCol(default=None)
msgDrops = BigIntCol(default=None)
msgRoutes = BigIntCol(default=None)
@@ -1292,11 +1292,11 @@
qmfUpdateTime = TimestampCol(default=None)
session = ForeignKey('Session', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- framesOutstanding = IntCol(default=None)
+ framesOutstanding = BigIntCol(default=None)
TxnStarts = BigIntCol(default=None)
TxnCommits = BigIntCol(default=None)
TxnRejects = BigIntCol(default=None)
- TxnCount = IntCol(default=None)
+ TxnCount = BigIntCol(default=None)
Modified: mgmt/trunk/mint/python/mint/schemaparser.py
===================================================================
--- mgmt/trunk/mint/python/mint/schemaparser.py 2008-12-18 15:03:14 UTC (rev 3022)
+++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-12-18 15:58:17 UTC (rev 3023)
@@ -26,7 +26,7 @@
self.dataTypesMap["uint8"] = self.dataTypesMap["hilo8"] = self.dataTypesMap["count8"] = self.dataTypesMap["mma8"] = "SmallIntCol"
self.dataTypesMap["hilo16"] = self.dataTypesMap["count16"] = self.dataTypesMap["mma16"] = "SmallIntCol"
self.dataTypesMap["uint16"] = "IntCol"
- self.dataTypesMap["hilo32"] = self.dataTypesMap["count32"] = self.dataTypesMap["mma32"] = self.dataTypesMap["atomic32"] = "IntCol"
+ self.dataTypesMap["hilo32"] = self.dataTypesMap["count32"] = self.dataTypesMap["mma32"] = "BigIntCol"
self.dataTypesMap["uint32"] = "BigIntCol"
self.dataTypesMap["uint64"] = self.dataTypesMap["hilo64"] = self.dataTypesMap["count64"] = self.dataTypesMap["mma64"] = self.dataTypesMap["mmaTime"] = "BigIntCol"
self.dataTypesMap["float"] = self.dataTypesMap["double"] = "FloatCol"
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-12-18 15:03:14 UTC (rev 3022)
+++ mgmt/trunk/mint/sql/schema.sql 2008-12-18 15:58:17 UTC (rev 3023)
@@ -326,12 +326,12 @@
id SERIAL PRIMARY KEY,
qmf_update_time TIMESTAMP,
exchange_id INT,
- producer_count INT,
- producer_count_low INT,
- producer_count_high INT,
- binding_count INT,
- binding_count_low INT,
- binding_count_high INT,
+ producer_count BIGINT,
+ producer_count_low BIGINT,
+ producer_count_high BIGINT,
+ binding_count BIGINT,
+ binding_count_low BIGINT,
+ binding_count_high BIGINT,
msg_receives BIGINT,
msg_drops BIGINT,
msg_routes BIGINT,
@@ -421,34 +421,34 @@
id SERIAL PRIMARY KEY,
qmf_update_time TIMESTAMP,
journal_id INT,
- record_depth INT,
- record_depth_low INT,
- record_depth_high INT,
+ record_depth BIGINT,
+ record_depth_low BIGINT,
+ record_depth_high BIGINT,
enqueues BIGINT,
dequeues BIGINT,
txn_enqueues BIGINT,
txn_dequeues BIGINT,
txn_commits BIGINT,
txn_aborts BIGINT,
- outstanding_ai_os INT,
- outstanding_ai_os_low INT,
- outstanding_ai_os_high INT,
- free_file_count INT,
- free_file_count_low INT,
- free_file_count_high INT,
- available_file_count INT,
- available_file_count_low INT,
- available_file_count_high INT,
+ outstanding_ai_os BIGINT,
+ outstanding_ai_os_low BIGINT,
+ outstanding_ai_os_high BIGINT,
+ free_file_count BIGINT,
+ free_file_count_low BIGINT,
+ free_file_count_high BIGINT,
+ available_file_count BIGINT,
+ available_file_count_low BIGINT,
+ available_file_count_high BIGINT,
write_wait_failures BIGINT,
write_busy_failures BIGINT,
read_record_count BIGINT,
read_busy_failures BIGINT,
- write_page_cache_depth INT,
- write_page_cache_depth_low INT,
- write_page_cache_depth_high INT,
- read_page_cache_depth INT,
- read_page_cache_depth_low INT,
- read_page_cache_depth_high INT
+ write_page_cache_depth BIGINT,
+ write_page_cache_depth_low BIGINT,
+ write_page_cache_depth_high BIGINT,
+ read_page_cache_depth BIGINT,
+ read_page_cache_depth_low BIGINT,
+ read_page_cache_depth_high BIGINT
);
CREATE TABLE link (
@@ -591,23 +591,23 @@
msg_txn_dequeues BIGINT,
msg_persist_enqueues BIGINT,
msg_persist_dequeues BIGINT,
- msg_depth INT,
- byte_depth INT,
+ msg_depth BIGINT,
+ byte_depth BIGINT,
byte_total_enqueues BIGINT,
byte_total_dequeues BIGINT,
byte_txn_enqueues BIGINT,
byte_txn_dequeues BIGINT,
byte_persist_enqueues BIGINT,
byte_persist_dequeues BIGINT,
- consumer_count INT,
- consumer_count_low INT,
- consumer_count_high INT,
- binding_count INT,
- binding_count_low INT,
- binding_count_high INT,
- unacked_messages INT,
- unacked_messages_low INT,
- unacked_messages_high INT,
+ consumer_count BIGINT,
+ consumer_count_low BIGINT,
+ consumer_count_high BIGINT,
+ binding_count BIGINT,
+ binding_count_low BIGINT,
+ binding_count_high BIGINT,
+ unacked_messages BIGINT,
+ unacked_messages_low BIGINT,
+ unacked_messages_high BIGINT,
message_latency_min BIGINT,
message_latency_max BIGINT,
message_latency_average BIGINT,
@@ -686,11 +686,11 @@
id SERIAL PRIMARY KEY,
qmf_update_time TIMESTAMP,
session_id INT,
- frames_outstanding INT,
+ frames_outstanding BIGINT,
txn_starts BIGINT,
txn_commits BIGINT,
txn_rejects BIGINT,
- txn_count INT
+ txn_count BIGINT
);
CREATE TABLE slot (
@@ -837,15 +837,15 @@
id SERIAL PRIMARY KEY,
qmf_update_time TIMESTAMP,
store_id INT,
- tpl_transaction_depth INT,
- tpl_transaction_depth_low INT,
- tpl_transaction_depth_high INT,
+ tpl_transaction_depth BIGINT,
+ tpl_transaction_depth_low BIGINT,
+ tpl_transaction_depth_high BIGINT,
tpl_txn_prepares BIGINT,
tpl_txn_commits BIGINT,
tpl_txn_aborts BIGINT,
- tpl_outstanding_ai_os INT,
- tpl_outstanding_ai_os_low INT,
- tpl_outstanding_ai_os_high INT
+ tpl_outstanding_ai_os BIGINT,
+ tpl_outstanding_ai_os_low BIGINT,
+ tpl_outstanding_ai_os_high BIGINT
);
CREATE TABLE submitter (
15 years, 5 months
rhmessaging commits: r3022 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-18 10:03:14 -0500 (Thu, 18 Dec 2008)
New Revision: 3022
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Remove an obsolete property
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-12-17 22:22:40 UTC (rev 3021)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-12-18 15:03:14 UTC (rev 3022)
@@ -773,9 +773,6 @@
prop = CuminProperty(self, "version")
prop.title = "Version"
- prop = CuminProperty(self, "dataDirEnabled")
- prop.title = "Data Dir. Enabled?"
-
prop = CuminProperty(self, "dataDir")
prop.title = "Data Directory"
15 years, 5 months
rhmessaging commits: r3021 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-17 17:22:40 -0500 (Wed, 17 Dec 2008)
New Revision: 3021
Modified:
mgmt/trunk/cumin/python/cumin/job.py
mgmt/trunk/cumin/python/cumin/system.strings
Log:
Scope the systems that appear under the job view
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-12-17 19:08:18 UTC (rev 3020)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-12-17 22:22:40 UTC (rev 3021)
@@ -557,10 +557,24 @@
self.__tabs.add_tab(JobAdsViewer(app, "jobads"))
self.__tabs.add_tab(JobOutput(app, "output"))
- self.__tabs.add_tab(SystemSet(app, "systems"))
+ self.__tabs.add_tab(JobSystemSet(app, "systems"))
self.__tabs.add_tab(CuminDetails(app, "details"))
+class JobSystemSet(SystemSet):
+ def get_args(self, session):
+ return self.frame.get_args(session)
+ def render_sql_where(self, session, job):
+ return """
+ where exists
+ (select 1
+ from slot
+ where system = s.node_name and job_id = %(id)s)
+ """
+
+ def get_sql_values(self, session, job):
+ return {"id": job.id}
+
class JobAdsSet(PropertySet):
def __init__(self, app, name):
super(JobAdsSet, self).__init__(app, name, )
Modified: mgmt/trunk/cumin/python/cumin/system.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.strings 2008-12-17 19:08:18 UTC (rev 3020)
+++ mgmt/trunk/cumin/python/cumin/system.strings 2008-12-17 22:22:40 UTC (rev 3021)
@@ -8,11 +8,13 @@
c.load_average1_min as load
from sysimage as s
left outer join sysimage_stats as c on c.id = s.stats_curr_id
+{sql_where}
{sql_orderby}
{sql_limit}
[SystemSet.count_sql]
-select count(*) from sysimage
+select count(*) from sysimage as s
+{sql_where}
[SystemSet.html]
<form id="{id}" method="post" action="?">
15 years, 5 months