rhmessaging commits: r3000 - mgmt/trunk/cumin/etc.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-15 10:46:40 -0500 (Mon, 15 Dec 2008)
New Revision: 3000
Modified:
mgmt/trunk/cumin/etc/sysvinit-cumin
Log:
Add --user arg to actually run cumin as its own user
Modified: mgmt/trunk/cumin/etc/sysvinit-cumin
===================================================================
--- mgmt/trunk/cumin/etc/sysvinit-cumin 2008-12-15 15:44:28 UTC (rev 2999)
+++ mgmt/trunk/cumin/etc/sysvinit-cumin 2008-12-15 15:46:40 UTC (rev 3000)
@@ -21,7 +21,7 @@
start() {
echo -n $"Starting Cumin daemon: "
- daemon --check $servicename $processname \&
+ daemon --user cumin --check $servicename $processname \&
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
17 years, 4 months
rhmessaging commits: r2999 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-15 10:44:28 -0500 (Mon, 15 Dec 2008)
New Revision: 2999
Modified:
mgmt/trunk/mint/python/mint/update.py
Log:
Skip stat updates that are too old; only adjust stat update timestamps, not all timestamps
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-12-15 15:43:39 UTC (rev 2998)
+++ mgmt/trunk/mint/python/mint/update.py 2008-12-15 15:44:28 UTC (rev 2999)
@@ -1,6 +1,5 @@
import sys
import logging
-import datetime
import types
import pickle
import psycopg2
@@ -14,6 +13,7 @@
from sql import *
from collections import deque
from util import *
+from datetime import datetime, timedelta
log = logging.getLogger("mint.update")
@@ -164,10 +164,7 @@
def processTimestamp(self, name, tstamp, results):
if tstamp:
- tnow = datetime.now()
t = datetime.fromtimestamp(tstamp / 1000000000)
- t = t > tnow and tnow or t
-
results[name] = t
class PropertyUpdate(ModelUpdate):
@@ -311,16 +308,22 @@
# Just drop it; we'll get more stats later
return
+ timestamps = self.object.getTimestamps()
+
+ tnow = datetime.now()
+ t = datetime.fromtimestamp(timestamps[0] / 1000000000)
+
+ if t < tnow - timedelta(seconds=30):
+ log.debug("Update is %i seconds old; skipping it", (tnow -t).seconds)
+ return
+
try:
attrs = self.processAttributes(self.object.getStatistics(), statsCls)
except ReferenceException:
# Drop it
return
- timestamps = self.object.getTimestamps()
-
- self.processTimestamp("qmfUpdateTime", timestamps[0], attrs)
-
+ attrs["qmfUpdateTime"] = t > tnow and tnow or t
attrs["%s_id" % cls.sqlmeta.table] = id
cursor = conn.cursor()
17 years, 4 months
rhmessaging commits: r2998 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-15 10:43:39 -0500 (Mon, 15 Dec 2008)
New Revision: 2998
Modified:
mgmt/trunk/mint/python/mint/__init__.py
Log:
Don't log on unexpected update; we in fact expect a certain number of updates for agents
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-12-12 21:53:21 UTC (rev 2997)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-12-15 15:43:39 UTC (rev 2998)
@@ -519,7 +519,6 @@
""" Invoked when an object is updated. """
if not self.updateObjects:
- log.debug("Received an unexpected update")
return
mbroker = self.getMintBrokerByQmfBroker(broker)
@@ -535,7 +534,6 @@
""" Invoked when an object is updated. """
if not self.updateObjects:
- log.debug("Received an unexpected update")
return
mbroker = self.getMintBrokerByQmfBroker(broker)
17 years, 4 months
rhmessaging commits: r2997 - in mgmt/trunk/mint: sql and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-12 16:53:21 -0500 (Fri, 12 Dec 2008)
New Revision: 2997
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/python/mint/schemaparser.py
mgmt/trunk/mint/sql/schema.sql
Log:
So deletes aren't horribly slow, index the stats pointers
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-12-12 20:43:26 UTC (rev 2996)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-12-12 21:53:21 UTC (rev 2997)
@@ -16,13 +16,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SlotStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SlotStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
@@ -137,13 +139,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('JobStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('JobStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
submitter = ForeignKey('Submitter', cascade='null', default=None)
@@ -249,13 +253,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SchedulerStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SchedulerStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
@@ -302,13 +308,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SubmitterStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SubmitterStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
JobQueueBirthdate = TimestampCol(default=None)
@@ -338,13 +346,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('NegotiatorStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('NegotiatorStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
@@ -406,13 +416,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('CollectorStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('CollectorStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
@@ -440,13 +452,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('MasterStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('MasterStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
@@ -502,13 +516,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('AclStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('AclStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
policyFile = StringCol(length=1000, default=None)
@@ -543,13 +559,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('ClusterStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('ClusterStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
clusterName = StringCol(length=1000, default=None)
@@ -590,13 +608,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('StoreStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('StoreStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
location = StringCol(length=1000, default=None)
@@ -638,13 +658,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('JournalStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('JournalStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
queue = ForeignKey('Queue', cascade='null', default=None)
name = StringCol(length=1000, default=None)
@@ -714,13 +736,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SystemStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SystemStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
systemId = BLOBCol(default=None)
osName = StringCol(length=1000, default=None)
@@ -748,13 +772,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('BrokerStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('BrokerStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
system = ForeignKey('System', cascade='null', default=None)
port = BigIntCol(default=None)
@@ -830,13 +856,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('AgentStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('AgentStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
clientConnection = ForeignKey('ClientConnection', cascade='null', default=None)
label = StringCol(length=1000, default=None)
@@ -864,13 +892,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('VhostStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('VhostStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
name = StringCol(length=1000, default=None)
@@ -895,13 +925,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('QueueStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('QueueStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
@@ -965,13 +997,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('ExchangeStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('ExchangeStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
@@ -1010,13 +1044,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('BindingStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('BindingStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
exchange = ForeignKey('Exchange', cascade='null', default=None)
queue = ForeignKey('Queue', cascade='null', default=None)
@@ -1044,13 +1080,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('ClientConnectionStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('ClientConnectionStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
address = StringCol(length=1000, default=None)
@@ -1089,13 +1127,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('LinkStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('LinkStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
host = StringCol(length=1000, default=None)
@@ -1155,13 +1195,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('BridgeStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('BridgeStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
link = ForeignKey('Link', cascade='null', default=None)
channelId = IntCol(default=None)
@@ -1200,13 +1242,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SessionStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SessionStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
@@ -1264,13 +1308,15 @@
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
qmfUpdateTime = TimestampCol(default=None)
qmfCreateTime = TimestampCol(default=None)
qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SysimageStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SysimageStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
classInfos = dict() # brokerId => classInfo
uuid = BLOBCol(default=None)
osName = StringCol(length=1000, default=None)
@@ -1351,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/python/mint/schemaparser.py
===================================================================
--- mgmt/trunk/mint/python/mint/schemaparser.py 2008-12-12 20:43:26 UTC (rev 2996)
+++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-12-12 21:53:21 UTC (rev 2997)
@@ -73,6 +73,11 @@
params = "'%s', cascade='null'" % (reference)
name = self.renameReservedWord(name)
self.generateAttrib(name, "ForeignKey", params)
+
+ def generateForeignKeyAttribWithIndex(self, name, reference):
+ self.generateForeignKeyAttrib(name, reference)
+ name = self.renameReservedWord(name)
+ self.pythonOutput += " %sIndex = DatabaseIndex(%s)\n" % (name, name)
def generateHiLoAttrib(self, name, type):
self.generateAttrib(name, type)
@@ -95,7 +100,7 @@
self.pythonOutput += " lazyUpdate = %s\n\n" % (lazyUpdate)
def generateQmfIdsIndex(self, className):
- self.pythonOutput += " qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)\n"
+ self.pythonOutput += " qmfIdsUnique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)\n"
def generateClassAttribs(self, schemaName, elements):
if (schemaName == "JournalStats"):
@@ -160,10 +165,11 @@
self.generateTimestampAttrib("Update")
self.generateTimestampAttrib("Create")
self.generateTimestampAttrib("Delete")
- self.generateForeignKeyAttrib("statsCurr", statsPythonName)
- self.generateForeignKeyAttrib("statsPrev", statsPythonName)
+ self.generateForeignKeyAttribWithIndex("statsCurr", statsPythonName)
+ self.generateForeignKeyAttribWithIndex("statsPrev", statsPythonName)
self.finalPythonOutput += "classToSchemaNameMap['%s'] = '%s'\n" % (pythonName, schemaName)
self.finalPythonOutput += "schemaNameToClassMap['%s'] = %s\n" % (schemaName, pythonName)
+ # XXX get rid of this
self.pythonOutput += " classInfos = dict() # brokerId => classInfo\n"
def generateMethod(self, elem):
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-12-12 20:43:26 UTC (rev 2996)
+++ mgmt/trunk/mint/sql/schema.sql 2008-12-12 21:53:21 UTC (rev 2997)
@@ -79,7 +79,9 @@
transfer_acl BOOL,
last_acl_load TIMESTAMP
);
-CREATE UNIQUE INDEX acl_qmf_ids_unique ON acl (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX acl_qmfIdsUnique ON acl (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX acl_statsPrevIndex ON acl (stats_prev_id);
+CREATE INDEX acl_statsCurrIndex ON acl (stats_curr_id);
CREATE TABLE acl_stats (
id SERIAL PRIMARY KEY,
@@ -106,7 +108,9 @@
broker_bank BIGINT,
agent_bank BIGINT
);
-CREATE UNIQUE INDEX agent_qmf_ids_unique ON agent (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX agent_qmfIdsUnique ON agent (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX agent_statsPrevIndex ON agent (stats_prev_id);
+CREATE INDEX agent_statsCurrIndex ON agent (stats_curr_id);
CREATE TABLE agent_stats (
id SERIAL PRIMARY KEY,
@@ -131,7 +135,9 @@
arguments BYTEA,
origin VARCHAR(1000)
);
-CREATE UNIQUE INDEX binding_qmf_ids_unique ON binding (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX binding_qmfIdsUnique ON binding (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX binding_statsPrevIndex ON binding (stats_prev_id);
+CREATE INDEX binding_statsCurrIndex ON binding (stats_curr_id);
CREATE TABLE binding_stats (
id SERIAL PRIMARY KEY,
@@ -163,7 +169,9 @@
excludes VARCHAR(1000),
dynamic BOOL
);
-CREATE UNIQUE INDEX bridge_qmf_ids_unique ON bridge (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX bridge_qmfIdsUnique ON bridge (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX bridge_statsCurrIndex ON bridge (stats_curr_id);
+CREATE INDEX bridge_statsPrevIndex ON bridge (stats_prev_id);
CREATE TABLE bridge_stats (
id SERIAL PRIMARY KEY,
@@ -193,7 +201,9 @@
data_dir VARCHAR(1000),
registration_id INT
);
-CREATE UNIQUE INDEX broker_qmf_ids_unique ON broker (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX broker_qmfIdsUnique ON broker (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX broker_statsCurrIndex ON broker (stats_curr_id);
+CREATE INDEX broker_statsPrevIndex ON broker (stats_prev_id);
CREATE TABLE broker_stats (
id SERIAL PRIMARY KEY,
@@ -219,7 +229,9 @@
federation_link BOOL,
auth_identity VARCHAR(1000)
);
-CREATE UNIQUE INDEX client_connection_qmf_ids_unique ON client_connection (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX client_connection_qmfIdsUnique ON client_connection (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX client_connection_statsCurrIndex ON client_connection (stats_curr_id);
+CREATE INDEX client_connection_statsPrevIndex ON client_connection (stats_prev_id);
CREATE TABLE client_connection_stats (
id SERIAL PRIMARY KEY,
@@ -251,7 +263,9 @@
status VARCHAR(1000),
members VARCHAR(4000)
);
-CREATE UNIQUE INDEX cluster_qmf_ids_unique ON cluster (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX cluster_qmfIdsUnique ON cluster (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX cluster_statsCurrIndex ON cluster (stats_curr_id);
+CREATE INDEX cluster_statsPrevIndex ON cluster (stats_prev_id);
CREATE TABLE cluster_stats (
id SERIAL PRIMARY KEY,
@@ -277,7 +291,9 @@
name VARCHAR(1000),
public_network_ip_addr VARCHAR(1000)
);
-CREATE UNIQUE INDEX collector_qmf_ids_unique ON collector (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX collector_qmfIdsUnique ON collector (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX collector_statsPrevIndex ON collector (stats_prev_id);
+CREATE INDEX collector_statsCurrIndex ON collector (stats_curr_id);
CREATE TABLE collector_stats (
id SERIAL PRIMARY KEY,
@@ -302,7 +318,9 @@
durable BOOL,
arguments BYTEA
);
-CREATE UNIQUE INDEX exchange_qmf_ids_unique ON exchange (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX exchange_qmfIdsUnique ON exchange (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX exchange_statsPrevIndex ON exchange (stats_prev_id);
+CREATE INDEX exchange_statsCurrIndex ON exchange (stats_curr_id);
CREATE TABLE exchange_stats (
id SERIAL PRIMARY KEY,
@@ -362,7 +380,9 @@
dag_man_job_id BIGINT,
ad BYTEA
);
-CREATE UNIQUE INDEX job_qmf_ids_unique ON job (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX job_qmfIdsUnique ON job (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX job_statsPrevIndex ON job (stats_prev_id);
+CREATE INDEX job_statsCurrIndex ON job (stats_curr_id);
CREATE TABLE job_stats (
id SERIAL PRIMARY KEY,
@@ -393,7 +413,9 @@
data_file_size BIGINT,
current_file_count BIGINT
);
-CREATE UNIQUE INDEX journal_qmf_ids_unique ON journal (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX journal_qmfIdsUnique ON journal (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX journal_statsPrevIndex ON journal (stats_prev_id);
+CREATE INDEX journal_statsCurrIndex ON journal (stats_curr_id);
CREATE TABLE journal_stats (
id SERIAL PRIMARY KEY,
@@ -446,7 +468,9 @@
transport VARCHAR(1000),
durable BOOL
);
-CREATE UNIQUE INDEX link_qmf_ids_unique ON link (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX link_qmfIdsUnique ON link (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX link_statsCurrIndex ON link (stats_curr_id);
+CREATE INDEX link_statsPrevIndex ON link (stats_prev_id);
CREATE TABLE link_stats (
id SERIAL PRIMARY KEY,
@@ -478,7 +502,9 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX master_qmf_ids_unique ON master (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX master_qmfIdsUnique ON master (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX master_statsCurrIndex ON master (stats_curr_id);
+CREATE INDEX master_statsPrevIndex ON master (stats_prev_id);
CREATE TABLE master_stats (
id SERIAL PRIMARY KEY,
@@ -512,7 +538,9 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX negotiator_qmf_ids_unique ON negotiator (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX negotiator_qmfIdsUnique ON negotiator (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX negotiator_statsPrevIndex ON negotiator (stats_prev_id);
+CREATE INDEX negotiator_statsCurrIndex ON negotiator (stats_curr_id);
CREATE TABLE negotiator_stats (
id SERIAL PRIMARY KEY,
@@ -549,7 +577,9 @@
exclusive BOOL,
arguments BYTEA
);
-CREATE UNIQUE INDEX queue_qmf_ids_unique ON queue (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX queue_qmfIdsUnique ON queue (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX queue_statsCurrIndex ON queue (stats_curr_id);
+CREATE INDEX queue_statsPrevIndex ON queue (stats_prev_id);
CREATE TABLE queue_stats (
id SERIAL PRIMARY KEY,
@@ -607,7 +637,9 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX scheduler_qmf_ids_unique ON scheduler (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX scheduler_qmfIdsUnique ON scheduler (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX scheduler_statsCurrIndex ON scheduler (stats_curr_id);
+CREATE INDEX scheduler_statsPrevIndex ON scheduler (stats_prev_id);
CREATE TABLE scheduler_stats (
id SERIAL PRIMARY KEY,
@@ -646,7 +678,9 @@
attached BOOL,
expire_time TIMESTAMP
);
-CREATE UNIQUE INDEX session_qmf_ids_unique ON session (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX session_qmfIdsUnique ON session (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX session_statsCurrIndex ON session (stats_curr_id);
+CREATE INDEX session_statsPrevIndex ON session (stats_prev_id);
CREATE TABLE session_stats (
id SERIAL PRIMARY KEY,
@@ -724,7 +758,9 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX slot_qmf_ids_unique ON slot (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX slot_qmfIdsUnique ON slot (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX slot_statsCurrIndex ON slot (stats_curr_id);
+CREATE INDEX slot_statsPrevIndex ON slot (stats_prev_id);
CREATE TABLE slot_stats (
id SERIAL PRIMARY KEY,
@@ -793,7 +829,9 @@
tpl_data_file_size BIGINT,
tpl_current_file_count BIGINT
);
-CREATE UNIQUE INDEX store_qmf_ids_unique ON store (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX store_qmfIdsUnique ON store (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX store_statsCurrIndex ON store (stats_curr_id);
+CREATE INDEX store_statsPrevIndex ON store (stats_prev_id);
CREATE TABLE store_stats (
id SERIAL PRIMARY KEY,
@@ -827,7 +865,9 @@
name VARCHAR(1000),
schedd_name VARCHAR(1000)
);
-CREATE UNIQUE INDEX submitter_qmf_ids_unique ON submitter (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX submitter_qmfIdsUnique ON submitter (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX submitter_statsPrevIndex ON submitter (stats_prev_id);
+CREATE INDEX submitter_statsCurrIndex ON submitter (stats_curr_id);
CREATE TABLE submitter_stats (
id SERIAL PRIMARY KEY,
@@ -858,7 +898,9 @@
mem_total BIGINT,
swap_total BIGINT
);
-CREATE UNIQUE INDEX sysimage_qmf_ids_unique ON sysimage (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX sysimage_qmfIdsUnique ON sysimage (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX sysimage_statsPrevIndex ON sysimage (stats_prev_id);
+CREATE INDEX sysimage_statsCurrIndex ON sysimage (stats_curr_id);
CREATE TABLE sysimage_stats (
id SERIAL PRIMARY KEY,
@@ -891,7 +933,9 @@
version VARCHAR(1000),
machine VARCHAR(1000)
);
-CREATE UNIQUE INDEX system_qmf_ids_unique ON system (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX system_qmfIdsUnique ON system (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX system_statsPrevIndex ON system (stats_prev_id);
+CREATE INDEX system_statsCurrIndex ON system (stats_curr_id);
CREATE TABLE system_stats (
id SERIAL PRIMARY KEY,
@@ -914,7 +958,9 @@
name VARCHAR(1000),
federation_tag VARCHAR(1000)
);
-CREATE UNIQUE INDEX vhost_qmf_ids_unique ON vhost (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX vhost_qmfIdsUnique ON vhost (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE INDEX vhost_statsPrevIndex ON vhost (stats_prev_id);
+CREATE INDEX vhost_statsCurrIndex ON vhost (stats_curr_id);
CREATE TABLE vhost_stats (
id SERIAL PRIMARY KEY,
17 years, 4 months
rhmessaging commits: r2996 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-12 15:43:26 -0500 (Fri, 12 Dec 2008)
New Revision: 2996
Modified:
mgmt/trunk/mint/python/mint/update.py
Log:
Commit after each delete op
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-12-12 20:22:53 UTC (rev 2995)
+++ mgmt/trunk/mint/python/mint/update.py 2008-12-12 20:43:26 UTC (rev 2996)
@@ -354,11 +354,15 @@
attrs = self.model.dbExpireThread.attrs
total = 0
+ conn.commit()
+
for op in self.model.dbExpireThread.ops:
log.debug("Running expire op %s", op)
count = op.execute(cursor, attrs)
+ conn.commit()
+
log.debug("%i records expired", count)
total += count
17 years, 4 months
rhmessaging commits: r2995 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-12 15:22:53 -0500 (Fri, 12 Dec 2008)
New Revision: 2995
Modified:
mgmt/trunk/mint/python/mint/__init__.py
mgmt/trunk/mint/python/mint/sql.py
mgmt/trunk/mint/python/mint/update.py
Log:
Add some more debug logging and __repr__ impls to clarify what's going on
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-12-12 20:00:28 UTC (rev 2994)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-12-12 20:22:53 UTC (rev 2995)
@@ -312,6 +312,9 @@
self.connected = False
+ def __repr__(self):
+ return "%s(%s)" % (self.__class__.__name__, self.url)
+
def getAmqpSession(self):
return self.qmfBroker.getAmqpSession()
@@ -368,6 +371,15 @@
raise e
def init(self):
+ log.info("Object updates are %s",
+ self.updateObjects and "enabled" or "disabled")
+
+ log.info("QMF server polling is %s",
+ self.pollRegistrations and "enabled" or "disabled")
+
+ log.info("Object expiration is %s",
+ self.dbExpiration and "enabled" or "disabled")
+
sqlhub.processConnection = self.dbConn = connectionForURI(self.dataUri)
assert self.qmfSession is None
@@ -506,6 +518,10 @@
def objectProps(self, broker, record):
""" Invoked when an object is updated. """
+ if not self.updateObjects:
+ log.debug("Received an unexpected update")
+ return
+
mbroker = self.getMintBrokerByQmfBroker(broker)
up = update.PropertyUpdate(self, mbroker, record)
@@ -518,6 +534,10 @@
def objectStats(self, broker, record):
""" Invoked when an object is updated. """
+ if not self.updateObjects:
+ log.debug("Received an unexpected update")
+ return
+
mbroker = self.getMintBrokerByQmfBroker(broker)
up = update.StatisticUpdate(self, mbroker, record)
Modified: mgmt/trunk/mint/python/mint/sql.py
===================================================================
--- mgmt/trunk/mint/python/mint/sql.py 2008-12-12 20:00:28 UTC (rev 2994)
+++ mgmt/trunk/mint/python/mint/sql.py 2008-12-12 20:22:53 UTC (rev 2995)
@@ -37,6 +37,9 @@
else:
return self.name
+ def __repr__(self):
+ return self.key()
+
def generate(self):
pass
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-12-12 20:00:28 UTC (rev 2994)
+++ mgmt/trunk/mint/python/mint/update.py 2008-12-12 20:22:53 UTC (rev 2995)
@@ -42,6 +42,8 @@
try:
update = self.updates.get(True, 1)
+ log.debug("Processing %s", update)
+
self.dequeueCount += 1
if self.stopRequested:
@@ -82,7 +84,7 @@
broker.objectDatabaseIds.rollback()
log.exception("Update failed")
-
+
class ReferenceException(Exception):
def __init__(self, sought):
self.sought = sought
@@ -97,6 +99,13 @@
self.object = object
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)
+
def getClass(self):
# XXX this is unfortunate
name = self.object.getClassKey().getClassName()
@@ -117,7 +126,7 @@
for key, value in attrs:
name = key.__repr__()
name = mint.schema.schemaReservedWordsMap.get(name, name)
-
+
if key.type == 10:
self.processReference(name, value, results)
elif key.type == 8:
@@ -248,7 +257,7 @@
# Case 3
attrs["id"] = id
-
+
op = SqlUpdate(cls, attrs)
op.execute(cursor, attrs)
@@ -342,13 +351,20 @@
def process(self, conn):
cursor = conn.cursor()
- rowcount = 0
attrs = self.model.dbExpireThread.attrs
+ total = 0
+
for op in self.model.dbExpireThread.ops:
- rowcount += op.execute(cursor, attrs)
- log.debug("%d records expired" % (rowcount))
+ log.debug("Running expire op %s", op)
+ count = op.execute(cursor, attrs)
+ log.debug("%i records expired", count)
+
+ total += count
+
+ log.debug("%i total records expired", total)
+
class UpdateQueue(ConcurrentQueue):
def __init__(self, maxsize=0, slotCount=1):
self.slotCount = slotCount
17 years, 4 months
rhmessaging commits: r2994 - mgmt/trunk/parsley/python/parsley.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-12 15:00:28 -0500 (Fri, 12 Dec 2008)
New Revision: 2994
Modified:
mgmt/trunk/parsley/python/parsley/loggingex.py
Log:
Also log the process id
Modified: mgmt/trunk/parsley/python/parsley/loggingex.py
===================================================================
--- mgmt/trunk/parsley/python/parsley/loggingex.py 2008-12-12 18:51:44 UTC (rev 2993)
+++ mgmt/trunk/parsley/python/parsley/loggingex.py 2008-12-12 20:00:28 UTC (rev 2994)
@@ -19,8 +19,10 @@
file = open(file, "a")
handler = StreamHandler(file)
- handler.setFormatter(Formatter("%(asctime)s %(levelname)s %(message)s"))
+ fmt = "%(process)d %(asctime)s %(levelname)s %(message)s"
+ handler.setFormatter(Formatter(fmt))
+
log = getLogger(name)
log.addHandler(handler)
log.setLevel(level)
17 years, 4 months
rhmessaging commits: r2993 - in mgmt/trunk/mint: python/mint and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-12 13:51:44 -0500 (Fri, 12 Dec 2008)
New Revision: 2993
Modified:
mgmt/trunk/mint/bin/mint-test
mgmt/trunk/mint/python/mint/tools.py
Log:
Fix mint-test, and make it work like the other mint commands
Modified: mgmt/trunk/mint/bin/mint-test
===================================================================
--- mgmt/trunk/mint/bin/mint-test 2008-12-12 17:46:11 UTC (rev 2992)
+++ mgmt/trunk/mint/bin/mint-test 2008-12-12 18:51:44 UTC (rev 2993)
@@ -1,84 +1,14 @@
-#!/usr/bin/env python
+#!/usr/bin/python
import sys, os, logging
-from time import sleep
-from mint import *
+from mint.tools import MintTestTool
-def usage():
- print "Usage: mint-test [DATABASE-URI] [BROKER-ADDRESSES...]"
- print "Example: mint-test postgresql://cumin@localhost/cumin localhost:5672"
- sys.exit(1)
-
-def do_main(uri, spec, hostports):
- model = MintModel(uri, spec, debug=False)
- model.check()
- model.init()
-
- conns = list()
-
- for host, port in hostports:
- conn = BrokerConnection(model, host, port)
- conns.append(conn)
-
- model.start()
- try:
- try:
- for conn in conns:
- conn.open()
-
- while True:
- sleep(5)
- finally:
- for conn in conns:
- try:
- conn.close()
- except:
- pass
- finally:
- model.stop()
-
def main():
- root = logging.getLogger("mint")
- root.setLevel(logging.DEBUG)
+ MintTestTool("mint-test").main()
- h = logging.StreamHandler()
- h.setLevel(logging.DEBUG)
- root.addHandler(h)
-
- if "-h" in sys.argv or "--help" in sys.argv:
- usage()
-
+if __name__ == "__main__":
try:
- uri = sys.argv[1]
- except IndexError:
- uri = "postgresql://cumin@localhost/cumin"
-
- if uri == "-":
- uri = "postgresql://cumin@localhost/cumin"
-
- addrs = sys.argv[2:]
-
- if not addrs:
- addrs = ["localhost:5672"]
-
- hostports = list()
-
- for addr in addrs:
- try:
- host, port = addr.split(":")
- hostports.append((host, int(port)))
- except ValueError, e:
- print "Error: Cannot parse '%s': %s" % (addr, e)
- sys.exit(1)
-
- spec = os.environ.get("AMQP_SPEC",
- os.path.normpath("/usr/share/amqp/amqp.0-10.xml"))
-
- try:
- do_main(uri, spec, hostports)
+ main()
except KeyboardInterrupt:
pass
-
-if __name__ == "__main__":
- main()
Modified: mgmt/trunk/mint/python/mint/tools.py
===================================================================
--- mgmt/trunk/mint/python/mint/tools.py 2008-12-12 17:46:11 UTC (rev 2992)
+++ mgmt/trunk/mint/python/mint/tools.py 2008-12-12 18:51:44 UTC (rev 2993)
@@ -65,9 +65,15 @@
if "debug" in opts:
enable_logging("mint", "debug", sys.stderr)
- self.do_run(opts, args)
+ data = opts.get("data", "postgresql://cumin@localhost/cumin")
+ freq = int(opts.get("expire-frequency", 600))
+ threshold = int(opts.get("expire-threshold", 24 * 3600))
- def do_run(self, opts, args):
+ model = MintModel(data, freq, threshold, debug="debug" in opts)
+
+ self.do_run(opts, args, model)
+
+ def do_run(self, opts, args, model):
raise Exception("Not implemented")
def main(self):
@@ -82,15 +88,7 @@
def init(self):
super(MintServerTool, self).init()
- def do_run(self, opts, args):
- ddef = "postgresql://cumin@localhost/cumin"
- freqDefault = 600 # 10 minutes
- thresholdDefault = 24 * 3600 # 1 day
- model = MintModel(opts.get("data", ddef),
- int(opts.get("expire-frequency", freqDefault)),
- int(opts.get("expire-threshold", thresholdDefault)),
- debug="debug" in opts)
-
+ def do_run(self, opts, args, model):
model.check()
model.init()
model.start()
@@ -104,6 +102,31 @@
finally:
model.stop()
+class MintTestTool(BaseMintTool):
+ def __init__(self, name):
+ super(MintTestTool, self).__init__(name)
+
+ def do_run(self, opts, args, model):
+ model.pollRegistrations = False
+
+ model.check()
+ model.init()
+ model.start()
+
+ added = list()
+
+ try:
+ for arg in args[1:]:
+ added.append(model.addBroker(arg))
+
+ while True:
+ sleep(2)
+ finally:
+ for broker in added:
+ model.delBroker(broker)
+
+ model.stop()
+
class MintBenchTool(BaseMintTool):
def __init__(self, name):
super(MintBenchTool, self).__init__(name)
@@ -111,14 +134,7 @@
def init(self):
super(MintBenchTool, self).init()
- def do_run(self, opts, args):
- ddef = "postgresql://cumin@localhost/cumin"
- freqDefault = 600 # 10 minutes
- thresholdDefault = 24 * 3600 # 1 day
- model = MintModel(opts.get("data", ddef),
- int(opts.get("expire-frequency", freqDefault)),
- int(opts.get("expire-threshold", thresholdDefault)),
- debug="debug" in opts)
+ def do_run(self, opts, args, model):
model.pollRegistrations = False
model.check()
@@ -154,4 +170,3 @@
model.delBroker(broker)
model.stop()
-
17 years, 4 months
rhmessaging commits: r2992 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-12-12 12:46:11 -0500 (Fri, 12 Dec 2008)
New Revision: 2992
Modified:
mgmt/trunk/cumin/python/cumin/collector.strings
mgmt/trunk/cumin/python/cumin/negotiator.strings
mgmt/trunk/cumin/python/cumin/scheduler.strings
Log:
Use the sysimage table instead of the deprecated system table
Modified: mgmt/trunk/cumin/python/cumin/collector.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/collector.strings 2008-12-12 16:40:01 UTC (rev 2991)
+++ mgmt/trunk/cumin/python/cumin/collector.strings 2008-12-12 17:46:11 UTC (rev 2992)
@@ -5,7 +5,7 @@
y.id as system_id,
y.node_name as system_name
from collector as c
-left outer join system as y on c.system = y.node_name
+left outer join sysimage as y on c.system = y.node_name
left outer join collector_stats as cs on cs.id = c.stats_curr_id
{sql_where}
{sql_orderby}
Modified: mgmt/trunk/cumin/python/cumin/negotiator.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/negotiator.strings 2008-12-12 16:40:01 UTC (rev 2991)
+++ mgmt/trunk/cumin/python/cumin/negotiator.strings 2008-12-12 17:46:11 UTC (rev 2992)
@@ -6,7 +6,7 @@
y.node_name as system_name
from negotiator as n
left outer join negotiator_stats as c on c.id = n.stats_curr_id
-left outer join system as y on n.system = y.node_name
+left outer join sysimage as y on n.system = y.node_name
{sql_where}
{sql_orderby}
{sql_limit}
Modified: mgmt/trunk/cumin/python/cumin/scheduler.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/scheduler.strings 2008-12-12 16:40:01 UTC (rev 2991)
+++ mgmt/trunk/cumin/python/cumin/scheduler.strings 2008-12-12 17:46:11 UTC (rev 2992)
@@ -9,7 +9,7 @@
c.total_held_jobs as held
from scheduler as s
left outer join scheduler_stats as c on c.id = s.stats_curr_id
-left outer join system as y on s.system = y.node_name
+left outer join sysimage as y on s.system = y.node_name
{sql_where}
{sql_orderby}
{sql_limit}
17 years, 4 months
rhmessaging commits: r2991 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-12-12 11:40:01 -0500 (Fri, 12 Dec 2008)
New Revision: 2991
Modified:
mgmt/trunk/cumin/python/cumin/model.py
mgmt/trunk/cumin/python/cumin/system.py
mgmt/trunk/cumin/python/cumin/system.strings
Log:
Added charts to system statistics page for sysimage memFree and loadAverage1Min
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-12-12 16:19:59 UTC (rev 2990)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-12-12 16:40:01 UTC (rev 2991)
@@ -647,6 +647,14 @@
prop = CuminProperty(self, "machine")
prop.title = "Architecture"
+ stat = CuminStat(self, "memFree")
+ stat.title = "Free Memory"
+ stat.highlow = True
+
+ stat = CuminStat(self, "loadAverage1Min")
+ stat.title = "1 Minute Load Average"
+ stat.highlow = True
+
action = self.SystemSlotVisualization(self, "slots")
action.navigable = False
Modified: mgmt/trunk/cumin/python/cumin/system.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.py 2008-12-12 16:19:59 UTC (rev 2990)
+++ mgmt/trunk/cumin/python/cumin/system.py 2008-12-12 16:40:01 UTC (rev 2991)
@@ -119,6 +119,14 @@
self.grid = self.SlotUtilizationGrid(app, "slot_grid")
self.add_child(self.grid)
+ chart = StatValueChart(app, "freemem")
+ chart.stats = ("memFree",)
+ self.add_child(chart)
+
+ chart = StatValueChart(app, "loadavg")
+ chart.stats = ("loadAverage1Min",)
+ self.add_child(chart)
+
def render_title(self, session):
return "Statistics"
@@ -278,7 +286,3 @@
return "Broker"
else:
return "Daemon"
-
-
-
-
Modified: mgmt/trunk/cumin/python/cumin/system.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.strings 2008-12-12 16:19:59 UTC (rev 2990)
+++ mgmt/trunk/cumin/python/cumin/system.strings 2008-12-12 16:40:01 UTC (rev 2991)
@@ -84,7 +84,19 @@
}
[SystemStats.html]
-{slot_grid}
+<table class="twocol">
+ <tbody>
+ <tr>
+ <td>
+ {slot_grid}
+ </td>
+ <td>
+ {freemem}
+ {loadavg}
+ </td>
+ </tr>
+ </tbody>
+</table>
<script type="text/javascript">
var show_slot_job_url = "{slot_job_url}";
</script>
17 years, 4 months