3:27 p.m.
Author: justi9
Date: 2008-09-03 09:27:06 -0400 (Wed, 03 Sep 2008)
New Revision: 2388
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Schema updated from mattf's changes
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-09-02 21:51:55 UTC (rev 2387)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-09-03 13:27:06 UTC (rev 2388)
@@ -13,6 +13,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('SystemStats', cascade='null', default=None)
statsPrev = ForeignKey('SystemStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
systemId = BLOBCol(default=None)
osName = StringCol(length=1000, default=None)
nodeName = StringCol(length=1000, default=None)
@@ -20,7 +21,6 @@
version = StringCol(length=1000, default=None)
machine = StringCol(length=1000, default=None)
- classInfos = dict() # brokerId => classInfo
class SystemStats(SQLObject):
class sqlmeta:
@@ -29,11 +29,11 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
system = ForeignKey('System', cascade='null', default=None)
-
classInfos = dict() # brokerId => classInfo
+
class Broker(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -45,6 +45,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('BrokerStats', cascade='null', default=None)
statsPrev = ForeignKey('BrokerStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
system = ForeignKey('System', cascade='null', default=None)
port = IntCol(default=None)
workerThreads = SmallIntCol(default=None)
@@ -56,7 +57,6 @@
version = StringCol(length=1000, default=None)
dataDir = StringCol(length=1000, default=None)
- classInfos = dict() # brokerId => classInfo
def joinCluster(self, model, callback, clusterName):
actualArgs = dict()
@@ -105,11 +105,11 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
broker = ForeignKey('Broker', cascade='null', default=None)
-
classInfos = dict() # brokerId => classInfo
+
class Agent(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -121,13 +121,13 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('AgentStats', cascade='null', default=None)
statsPrev = ForeignKey('AgentStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
clientConnection = ForeignKey('ClientConnection', cascade='null',
default=None)
label = StringCol(length=1000, default=None)
registeredTo = BigIntCol(default=None)
systemId = BLOBCol(default=None)
objectIdBank = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
class AgentStats(SQLObject):
class sqlmeta:
@@ -136,11 +136,11 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
agent = ForeignKey('Agent', cascade='null', default=None)
-
classInfos = dict() # brokerId => classInfo
+
class Vhost(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -152,10 +152,10 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('VhostStats', cascade='null', default=None)
statsPrev = ForeignKey('VhostStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
name = StringCol(length=1000, default=None)
- classInfos = dict() # brokerId => classInfo
class VhostStats(SQLObject):
class sqlmeta:
@@ -164,11 +164,11 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
vhost = ForeignKey('Vhost', cascade='null', default=None)
-
classInfos = dict() # brokerId => classInfo
+
class Queue(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -180,6 +180,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('QueueStats', cascade='null', default=None)
statsPrev = ForeignKey('QueueStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
durable = BoolCol(default=None)
@@ -187,7 +188,6 @@
exclusive = BoolCol(default=None)
arguments = StringCol(default=None)
- classInfos = dict() # brokerId => classInfo
def purge(self, model, callback, request):
"""Discard all or some messages on a queue"""
@@ -205,6 +205,7 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
queue = ForeignKey('Queue', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
msgTotalEnqueues = BigIntCol(default=None)
msgTotalDequeues = BigIntCol(default=None)
msgTxnEnqueues = BigIntCol(default=None)
@@ -241,7 +242,6 @@
messageLatencyAverage = BigIntCol(default=None)
messageLatencySamples = BigIntCol(default=None)
- classInfos = dict() # brokerId => classInfo
@@ -256,12 +256,12 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('ExchangeStats', cascade='null', default=None)
statsPrev = ForeignKey('ExchangeStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
type = StringCol(length=1000, default=None)
durable = BoolCol(default=None)
- classInfos = dict() # brokerId => classInfo
class ExchangeStats(SQLObject):
class sqlmeta:
@@ -270,6 +270,7 @@
idOriginal = BigIntCol(default=None)
recTime = 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)
@@ -283,7 +284,6 @@
byteDrops = BigIntCol(default=None)
byteRoutes = BigIntCol(default=None)
- classInfos = dict() # brokerId => classInfo
@@ -298,12 +298,12 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('BindingStats', cascade='null', default=None)
statsPrev = ForeignKey('BindingStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
exchange = ForeignKey('Exchange', cascade='null', default=None)
queue = ForeignKey('Queue', cascade='null', default=None)
bindingKey = StringCol(length=1000, default=None)
arguments = StringCol(default=None)
- classInfos = dict() # brokerId => classInfo
class BindingStats(SQLObject):
class sqlmeta:
@@ -312,9 +312,9 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
binding = ForeignKey('Binding', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
msgMatched = BigIntCol(default=None)
- classInfos = dict() # brokerId => classInfo
@@ -329,11 +329,11 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('ClientConnectionStats', cascade='null',
default=None)
statsPrev = ForeignKey('ClientConnectionStats', cascade='null',
default=None)
+ classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
address = StringCol(length=1000, default=None)
incoming = BoolCol(default=None)
- classInfos = dict() # brokerId => classInfo
def close(self, model, callback):
actualArgs = dict()
@@ -349,6 +349,7 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
clientConnection = ForeignKey('ClientConnection', cascade='null',
default=None)
+ classInfos = dict() # brokerId => classInfo
closing = BoolCol(default=None)
authIdentity = StringCol(length=1000, default=None)
framesFromClient = BigIntCol(default=None)
@@ -356,7 +357,6 @@
bytesFromClient = BigIntCol(default=None)
bytesToClient = BigIntCol(default=None)
- classInfos = dict() # brokerId => classInfo
@@ -371,13 +371,13 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('LinkStats', cascade='null', default=None)
statsPrev = ForeignKey('LinkStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
host = StringCol(length=1000, default=None)
port = IntCol(default=None)
useSsl = BoolCol(default=None)
durable = BoolCol(default=None)
- classInfos = dict() # brokerId => classInfo
def close(self, model, callback):
actualArgs = dict()
@@ -409,10 +409,10 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
link = ForeignKey('Link', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
state = StringCol(length=1000, default=None)
lastError = StringCol(length=1000, default=None)
- classInfos = dict() # brokerId => classInfo
@@ -427,6 +427,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('BridgeStats', cascade='null', default=None)
statsPrev = ForeignKey('BridgeStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
link = ForeignKey('Link', cascade='null', default=None)
channelId = SmallIntCol(default=None)
durable = BoolCol(default=None)
@@ -438,7 +439,6 @@
tag = StringCol(length=1000, default=None)
excludes = StringCol(length=1000, default=None)
- classInfos = dict() # brokerId => classInfo
def close(self, model, callback):
actualArgs = dict()
@@ -454,11 +454,11 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
bridge = ForeignKey('Bridge', cascade='null', default=None)
-
classInfos = dict() # brokerId => classInfo
+
class Session(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -470,13 +470,13 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('SessionStats', cascade='null', default=None)
statsPrev = ForeignKey('SessionStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
channelId = SmallIntCol(default=None)
clientConnection = ForeignKey('ClientConnection', cascade='null',
default=None)
detachedLifespan = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
def solicitAck(self, model, callback):
actualArgs = dict()
@@ -513,11 +513,11 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
session = ForeignKey('Session', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
attached = BoolCol(default=None)
expireTime = BigIntCol(default=None)
framesOutstanding = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
@@ -532,6 +532,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('StoreStats', cascade='null', default=None)
statsPrev = ForeignKey('StoreStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
location = StringCol(length=1000, default=None)
defaultInitialFileCount = SmallIntCol(default=None)
@@ -544,7 +545,6 @@
tplDataFileSize = IntCol(default=None)
tplCurrentFileCount = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
class StoreStats(SQLObject):
class sqlmeta:
@@ -553,6 +553,7 @@
idOriginal = BigIntCol(default=None)
recTime = 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)
@@ -563,7 +564,6 @@
tplOutstandingAIOsLow = IntCol(default=None)
tplOutstandingAIOsHigh = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
@@ -578,6 +578,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('JournalStats', cascade='null', default=None)
statsPrev = ForeignKey('JournalStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
queue = ForeignKey('Queue', cascade='null', default=None)
name = StringCol(length=1000, default=None)
directory = StringCol(length=1000, default=None)
@@ -590,7 +591,6 @@
dataFileSize = IntCol(default=None)
currentFileCount = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
def expand(self, model, callback, by):
"""Increase number of files allocated for this
journal"""
@@ -608,6 +608,7 @@
idOriginal = BigIntCol(default=None)
recTime = 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)
@@ -637,7 +638,6 @@
readPageCacheDepthLow = IntCol(default=None)
readPageCacheDepthHigh = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
@@ -652,6 +652,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('SlotStats', cascade='null', default=None)
statsPrev = ForeignKey('SlotStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
AccountingGroup = StringCol(length=1000, default=None)
Arch = StringCol(length=1000, default=None)
CheckpointPlatform = StringCol(length=1000, default=None)
@@ -699,8 +700,11 @@
WindowsMajorVersion = IntCol(default=None)
WindowsMinorVersion = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
+ CondorPlatform = StringCol(length=1000, default=None)
+ CondorVersion = StringCol(length=1000, default=None)
+ DaemonStartTime = BigIntCol(default=None)
+
class SlotStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -708,6 +712,7 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
slot = ForeignKey('Slot', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
Activity = StringCol(length=1000, default=None)
ClockDay = IntCol(default=None)
ClockMin = IntCol(default=None)
@@ -741,10 +746,16 @@
TotalTimeUnclaimedBenchmarking = IntCol(default=None)
TotalTimeUnclaimedIdle = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
+ MonitorSelfAge = IntCol(default=None)
+ MonitorSelfCPUUsage = FloatCol(default=None)
+ MonitorSelfImageSize = FloatCol(default=None)
+ MonitorSelfRegisteredSocketCount = IntCol(default=None)
+ MonitorSelfResidentSetSize = IntCol(default=None)
+ MonitorSelfTime = BigIntCol(default=None)
+
class Job(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -756,6 +767,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('JobStats', cascade='null', default=None)
statsPrev = ForeignKey('JobStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
AccountingGroup = StringCol(length=1000, default=None)
Args = StringCol(length=4000, default=None)
@@ -779,7 +791,6 @@
UserLog = StringCol(length=4000, default=None)
HoldReason = StringCol(length=4000, default=None)
- classInfos = dict() # brokerId => classInfo
def GetAd(self, model, callback, JobAd):
actualArgs = dict()
@@ -796,11 +807,11 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
job = ForeignKey('Job', cascade='null', default=None)
-
classInfos = dict() # brokerId => classInfo
+
class Scheduler(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -812,6 +823,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('SchedulerStats', cascade='null', default=None)
statsPrev = ForeignKey('SchedulerStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
JobQueueBirthdate = BigIntCol(default=None)
MaxJobsRunning = IntCol(default=None)
Machine = StringCol(length=1000, default=None)
@@ -819,8 +831,11 @@
Name = StringCol(length=1000, default=None)
PublicNetworkIpAddr = StringCol(length=1000, default=None)
- classInfos = dict() # brokerId => classInfo
+ CondorPlatform = StringCol(length=1000, default=None)
+ CondorVersion = StringCol(length=1000, default=None)
+ DaemonStartTime = BigIntCol(default=None)
+
class SchedulerStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -828,6 +843,7 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
NumUsers = IntCol(default=None)
TotalHeldJobs = IntCol(default=None)
TotalIdleJobs = IntCol(default=None)
@@ -835,10 +851,16 @@
TotalRemovedJobs = IntCol(default=None)
TotalRunningJobs = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
+ MonitorSelfAge = IntCol(default=None)
+ MonitorSelfCPUUsage = FloatCol(default=None)
+ MonitorSelfImageSize = FloatCol(default=None)
+ MonitorSelfRegisteredSocketCount = IntCol(default=None)
+ MonitorSelfResidentSetSize = IntCol(default=None)
+ MonitorSelfTime = BigIntCol(default=None)
+
class Submitter(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -850,13 +872,13 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('SubmitterStats', cascade='null', default=None)
statsPrev = ForeignKey('SubmitterStats', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
JobQueueBirthdate = IntCol(default=None)
Machine = StringCol(length=1000, default=None)
Name = StringCol(length=1000, default=None)
ScheddName = StringCol(length=1000, default=None)
- classInfos = dict() # brokerId => classInfo
class SubmitterStats(SQLObject):
class sqlmeta:
@@ -865,11 +887,11 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
submitter = ForeignKey('Submitter', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
HeldJobs = IntCol(default=None)
IdleJobs = IntCol(default=None)
RunningJobs = IntCol(default=None)
- classInfos = dict() # brokerId => classInfo
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-09-02 21:51:55 UTC (rev 2387)
+++ mgmt/trunk/mint/sql/schema.sql 2008-09-03 13:27:06 UTC (rev 2388)
@@ -415,7 +415,10 @@
machine VARCHAR(1000),
my_address VARCHAR(1000),
name VARCHAR(1000),
- public_network_ip_addr VARCHAR(1000)
+ public_network_ip_addr VARCHAR(1000),
+ condor_platform VARCHAR(1000),
+ condor_version VARCHAR(1000),
+ daemon_start_time BIGINT
);
CREATE TABLE scheduler_stats (
@@ -428,7 +431,13 @@
total_idle_jobs INT,
total_job_ads INT,
total_removed_jobs INT,
- total_running_jobs INT
+ total_running_jobs INT,
+ monitor_self_age INT,
+ monitor_self_cpu_usage FLOAT,
+ monitor_self_image_size FLOAT,
+ monitor_self_registered_socket_count INT,
+ monitor_self_resident_set_size INT,
+ monitor_self_time BIGINT
);
CREATE TABLE session (
@@ -511,7 +520,10 @@
virtual_memory INT,
windows_build_number INT,
windows_major_version INT,
- windows_minor_version INT
+ windows_minor_version INT,
+ condor_platform VARCHAR(1000),
+ condor_version VARCHAR(1000),
+ daemon_start_time BIGINT
);
CREATE TABLE slot_stats (
@@ -550,7 +562,13 @@
total_time_preempting_killing INT,
total_time_preempting_vacating INT,
total_time_unclaimed_benchmarking INT,
- total_time_unclaimed_idle INT
+ total_time_unclaimed_idle INT,
+ monitor_self_age INT,
+ monitor_self_cpu_usage FLOAT,
+ monitor_self_image_size FLOAT,
+ monitor_self_registered_socket_count INT,
+ monitor_self_resident_set_size INT,
+ monitor_self_time BIGINT
);
CREATE TABLE store (
6037
days inactive
6037
days old
rhmessaging-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
rhmessaging-commits＠lists.jboss.org