rhmessaging commits: r2367 - in mgmt/trunk/mint: sql and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-08-29 10:36:01 -0400 (Fri, 29 Aug 2008)
New Revision: 2367
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Update to the latest condor schema
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-08-29 14:35:41 UTC (rev 2366)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-08-29 14:36:01 UTC (rev 2367)
@@ -756,6 +756,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('JobStats', cascade='null', default=None)
statsPrev = ForeignKey('JobStats', cascade='null', default=None)
+ scheduler = ForeignKey('Scheduler', cascade='null', default=None)
AccountingGroup = StringCol(length=1000, default=None)
Args = StringCol(length=4000, default=None)
ClusterId = IntCol(default=None)
@@ -849,6 +850,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('SubmitterStats', cascade='null', default=None)
statsPrev = ForeignKey('SubmitterStats', cascade='null', default=None)
+ scheduler = ForeignKey('Scheduler', cascade='null', default=None)
JobQueueBirthdate = IntCol(default=None)
Machine = StringCol(length=1000, default=None)
Name = StringCol(length=1000, default=None)
@@ -986,15 +988,21 @@
classToSchemaNameMap['Job'] = 'Job'
schemaNameToClassMap['Job'] = Job
+Scheduler.sqlmeta.addJoin(SQLMultipleJoin('Job', joinMethodName='jobs'))
+
+
Job.sqlmeta.addJoin(SQLMultipleJoin('JobStats', joinMethodName='stats'))
-classToSchemaNameMap['Scheduler'] = 'scheduler'
-schemaNameToClassMap['scheduler'] = Scheduler
+classToSchemaNameMap['Scheduler'] = 'Scheduler'
+schemaNameToClassMap['Scheduler'] = Scheduler
Scheduler.sqlmeta.addJoin(SQLMultipleJoin('SchedulerStats', joinMethodName='stats'))
-classToSchemaNameMap['Submitter'] = 'submitter'
-schemaNameToClassMap['submitter'] = Submitter
+classToSchemaNameMap['Submitter'] = 'Submitter'
+schemaNameToClassMap['Submitter'] = Submitter
+Scheduler.sqlmeta.addJoin(SQLMultipleJoin('Submitter', joinMethodName='submitters'))
+
+
Submitter.sqlmeta.addJoin(SQLMultipleJoin('SubmitterStats', joinMethodName='stats'))
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-08-29 14:35:41 UTC (rev 2366)
+++ mgmt/trunk/mint/sql/schema.sql 2008-08-29 14:36:01 UTC (rev 2367)
@@ -229,6 +229,7 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
+ scheduler_id INT,
accounting_group VARCHAR(1000),
args VARCHAR(4000),
cluster_id INT,
@@ -599,6 +600,7 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
+ scheduler_id INT,
job_queue_birthdate INT,
machine VARCHAR(1000),
name VARCHAR(1000),
@@ -725,6 +727,8 @@
ALTER TABLE job ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES job_stats (id) ON DELETE SET NULL;
+ALTER TABLE job ADD CONSTRAINT scheduler_id_exists FOREIGN KEY (scheduler_id) REFERENCES scheduler (id) ON DELETE SET NULL;
+
ALTER TABLE job_stats ADD CONSTRAINT job_id_exists FOREIGN KEY (job_id) REFERENCES job (id) ON DELETE SET NULL;
ALTER TABLE journal ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES journal_stats (id) ON DELETE SET NULL;
@@ -785,6 +789,8 @@
ALTER TABLE submitter ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES submitter_stats (id) ON DELETE SET NULL;
+ALTER TABLE submitter ADD CONSTRAINT scheduler_id_exists FOREIGN KEY (scheduler_id) REFERENCES scheduler (id) ON DELETE SET NULL;
+
ALTER TABLE submitter_stats ADD CONSTRAINT submitter_id_exists FOREIGN KEY (submitter_id) REFERENCES submitter (id) ON DELETE SET NULL;
ALTER TABLE system ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES system_stats (id) ON DELETE SET NULL;
15 years, 8 months
rhmessaging commits: r2366 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-08-29 10:35:41 -0400 (Fri, 29 Aug 2008)
New Revision: 2366
Modified:
mgmt/trunk/mint/python/mint/update.py
Log:
If the queue has an interesting depth, note it
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-08-28 20:08:58 UTC (rev 2365)
+++ mgmt/trunk/mint/python/mint/update.py 2008-08-29 14:35:41 UTC (rev 2366)
@@ -27,6 +27,11 @@
def run(self):
while True:
+ size = self.updates.qsize()
+
+ if size > 1:
+ log.debug("Queue depth is %i", self.updates.qsize())
+
try:
update = self.updates.get(True, 1)
except Empty:
15 years, 8 months
rhmessaging commits: r2365 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-08-28 16:08:58 -0400 (Thu, 28 Aug 2008)
New Revision: 2365
Added:
mgmt/trunk/cumin/python/cumin/scheduler.py
mgmt/trunk/cumin/python/cumin/scheduler.strings
Modified:
mgmt/trunk/cumin/python/cumin/model.py
mgmt/trunk/cumin/python/cumin/parameters.py
mgmt/trunk/cumin/python/cumin/pool.py
Log:
Add basic scheduler views and navigation
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-08-28 18:40:49 UTC (rev 2364)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-08-28 20:08:58 UTC (rev 2365)
@@ -21,8 +21,9 @@
self.classes = list()
self.invocations = set()
-
- CuminSystem(self)
+
+ # Messaging
+
CuminBroker(self)
CuminQueue(self)
CuminExchange(self)
@@ -36,8 +37,17 @@
CuminBrokerRegistration(self)
CuminBrokerGroup(self)
+
+ # Grid
+
+ CuminScheduler(self)
+
CuminPool(self)
+ # Systems
+
+ CuminSystem(self)
+
def check(self):
self.data.check()
@@ -1422,6 +1432,28 @@
def show_object(self, session, pool):
return self.cumin_model.show_main(session).show_pool(session, pool)
+class CuminScheduler(RemoteClass):
+ def __init__(self, model):
+ super(CuminScheduler, self).__init__(model, "scheduler",
+ Scheduler, SchedulerStats)
+
+ def get_title(self, session):
+ return "Scheduler"
+
+ def get_object_name(self, sched):
+ return sched.Name
+
+ def show_object(self, session, sched):
+ # XXX temporary solution
+ for pool in Pool.selectBy(name="main"):
+ break
+
+ frame = self.cumin_model.show_main(session)
+ frame = frame.show_pool(session, pool)
+ frame = frame.show_scheduler(session, sched).show_view(session)
+
+ return frame
+
class ModelPage(Page):
def __init__(self, app, name):
super(ModelPage, self).__init__(app, name)
Modified: mgmt/trunk/cumin/python/cumin/parameters.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/parameters.py 2008-08-28 18:40:49 UTC (rev 2364)
+++ mgmt/trunk/cumin/python/cumin/parameters.py 2008-08-28 20:08:58 UTC (rev 2365)
@@ -86,6 +86,13 @@
def do_marshal(self, queue):
return str(queue.id)
+class SchedulerParameter(Parameter):
+ def do_unmarshal(self, string):
+ return Scheduler.get(int(string))
+
+ def do_marshal(self, sched):
+ return str(sched.id)
+
class SessionParameter(Parameter):
def do_unmarshal(self, string):
return Session.get(int(string))
Modified: mgmt/trunk/cumin/python/cumin/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/pool.py 2008-08-28 18:40:49 UTC (rev 2364)
+++ mgmt/trunk/cumin/python/cumin/pool.py 2008-08-28 20:08:58 UTC (rev 2365)
@@ -12,6 +12,7 @@
from formats import *
from util import *
from job import JobSet
+from scheduler import SchedulerSet, SchedulerFrame
strings = StringCatalog(__file__)
log = logging.getLogger("cumin.pool")
@@ -49,9 +50,17 @@
self.add_mode(view)
self.set_view_mode(view)
+ self.__sched = SchedulerFrame(app, "sched")
+ self.add_mode(self.__sched)
+
def show_job(self, session, job):
return self
+ def show_scheduler(self, session, sched):
+ self.__sched.set_object(session, sched)
+ self.page.set_current_frame(session, self.__sched)
+ return self.show_mode(session, self.__sched)
+
class PoolView(CuminView):
def __init__(self, app, name):
super(PoolView, self).__init__(app, name)
@@ -65,9 +74,15 @@
jobs = self.JobsTab(app, "jobs")
self.__tabs.add_tab(jobs)
+ scheds = self.SchedulersTab(app, "scheds")
+ self.__tabs.add_tab(scheds)
+
class JobsTab(JobSet):
pass
+ class SchedulersTab(SchedulerSet):
+ pass
+
class PoolStatus(CuminStatus):
pass
Added: mgmt/trunk/cumin/python/cumin/scheduler.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/scheduler.py (rev 0)
+++ mgmt/trunk/cumin/python/cumin/scheduler.py 2008-08-28 20:08:58 UTC (rev 2365)
@@ -0,0 +1,62 @@
+import logging
+
+from wooly import *
+from wooly.widgets import *
+from wooly.forms import *
+from wooly.resources import *
+from wooly.tables import *
+
+from stat import *
+from widgets import *
+from parameters import *
+from formats import *
+from util import *
+
+strings = StringCatalog(__file__)
+log = logging.getLogger("cumin.scheduler")
+
+class SchedulerSet(CuminTable):
+ def __init__(self, app, name):
+ super(SchedulerSet, self).__init__(app, name)
+
+ col = self.NameColumn(app, "name")
+ self.add_column(col)
+
+ self.set_default_column(col)
+
+ def render_title(self, session):
+ return "Schedulers %s" % fmt_count(Scheduler.select().count())
+
+ class NameColumn(SqlTableColumn):
+ def render_title(self, session, data):
+ return "Name"
+
+ def render_content(self, session, data):
+ sched = Identifiable(data["id"])
+ branch = session.branch()
+ self.frame.show_scheduler(branch, sched).show_view(branch)
+ return fmt_olink(branch, sched, name=data["name"])
+
+class SchedulerFrame(CuminFrame):
+ def __init__(self, app, name):
+ super(SchedulerFrame, self).__init__(app, name)
+
+ self.object = SchedulerParameter(app, "id")
+ self.add_parameter(self.object)
+
+ view = SchedulerView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
+
+class SchedulerView(CuminView):
+ def __init__(self, app, name):
+ super(SchedulerView, self).__init__(app, name)
+
+ status = SchedulerStatus(app, "status")
+ self.add_child(status)
+
+ self.__tabs = TabbedModeSet(app, "tabs")
+ self.add_child(self.__tabs)
+
+class SchedulerStatus(CuminStatus):
+ pass
Added: mgmt/trunk/cumin/python/cumin/scheduler.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/scheduler.strings (rev 0)
+++ mgmt/trunk/cumin/python/cumin/scheduler.strings 2008-08-28 20:08:58 UTC (rev 2365)
@@ -0,0 +1,8 @@
+[SchedulerSet.sql]
+select
+ s.id,
+ s.name
+from scheduler as s
+
+[SchedulerSet.count_sql]
+select count(*) from scheduler
15 years, 8 months
rhmessaging commits: r2364 - in mgmt/trunk/mint: sql and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-08-28 14:40:49 -0400 (Thu, 28 Aug 2008)
New Revision: 2364
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Update to latest condor schema
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-08-28 17:47:18 UTC (rev 2363)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-08-28 18:40:49 UTC (rev 2364)
@@ -780,6 +780,14 @@
classInfos = dict() # brokerId => classInfo
+ def GetAd(self, model, callback, JobAd):
+ actualArgs = dict()
+ actualArgs["JobAd"] = JobAd
+ conn = model.connections[self.managedBroker]
+ classInfo = self.classInfos[self.managedBroker]
+ conn.callMethod(self.idOriginal, classInfo, "GetAd",
+ callback, args=actualArgs)
+
class JobStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -792,6 +800,77 @@
+class Scheduler(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ idOriginal = BigIntCol(default=None)
+ recTime = TimestampCol(default=None)
+ creationTime = TimestampCol(default=None)
+ deletionTime = TimestampCol(default=None)
+ managedBroker = StringCol(length=1000, default=None)
+ statsCurr = ForeignKey('SchedulerStats', cascade='null', default=None)
+ statsPrev = ForeignKey('SchedulerStats', cascade='null', default=None)
+ JobQueueBirthdate = BigIntCol(default=None)
+ MaxJobsRunning = IntCol(default=None)
+ Machine = StringCol(length=1000, default=None)
+ MyAddress = StringCol(length=1000, default=None)
+ Name = StringCol(length=1000, default=None)
+ PublicNetworkIpAddr = StringCol(length=1000, default=None)
+
+ classInfos = dict() # brokerId => classInfo
+
+class SchedulerStats(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ idOriginal = BigIntCol(default=None)
+ recTime = TimestampCol(default=None)
+ scheduler = ForeignKey('Scheduler', cascade='null', default=None)
+ NumUsers = IntCol(default=None)
+ TotalHeldJobs = IntCol(default=None)
+ TotalIdleJobs = IntCol(default=None)
+ TotalJobAds = IntCol(default=None)
+ TotalRemovedJobs = IntCol(default=None)
+ TotalRunningJobs = IntCol(default=None)
+
+ classInfos = dict() # brokerId => classInfo
+
+
+
+class Submitter(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ idOriginal = BigIntCol(default=None)
+ recTime = TimestampCol(default=None)
+ creationTime = TimestampCol(default=None)
+ deletionTime = TimestampCol(default=None)
+ managedBroker = StringCol(length=1000, default=None)
+ statsCurr = ForeignKey('SubmitterStats', cascade='null', default=None)
+ statsPrev = ForeignKey('SubmitterStats', 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:
+ lazyUpdate = True
+
+ idOriginal = BigIntCol(default=None)
+ recTime = TimestampCol(default=None)
+ submitter = ForeignKey('Submitter', cascade='null', default=None)
+ HeldJobs = IntCol(default=None)
+ IdleJobs = IntCol(default=None)
+ RunningJobs = IntCol(default=None)
+
+ classInfos = dict() # brokerId => classInfo
+
+
+
classToSchemaNameMap = dict()
schemaNameToClassMap = dict()
classToSchemaNameMap['System'] = 'System'
@@ -909,3 +988,13 @@
Job.sqlmeta.addJoin(SQLMultipleJoin('JobStats', joinMethodName='stats'))
+classToSchemaNameMap['Scheduler'] = 'scheduler'
+schemaNameToClassMap['scheduler'] = Scheduler
+
+Scheduler.sqlmeta.addJoin(SQLMultipleJoin('SchedulerStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Submitter'] = 'submitter'
+schemaNameToClassMap['submitter'] = Submitter
+
+Submitter.sqlmeta.addJoin(SQLMultipleJoin('SubmitterStats', joinMethodName='stats'))
+
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-08-28 17:47:18 UTC (rev 2363)
+++ mgmt/trunk/mint/sql/schema.sql 2008-08-28 18:40:49 UTC (rev 2364)
@@ -400,6 +400,36 @@
message_latency_samples BIGINT
);
+CREATE TABLE scheduler (
+ id SERIAL PRIMARY KEY,
+ id_original BIGINT,
+ rec_time TIMESTAMP,
+ creation_time TIMESTAMP,
+ deletion_time TIMESTAMP,
+ managed_broker VARCHAR(1000),
+ stats_curr_id INT,
+ stats_prev_id INT,
+ job_queue_birthdate BIGINT,
+ max_jobs_running INT,
+ machine VARCHAR(1000),
+ my_address VARCHAR(1000),
+ name VARCHAR(1000),
+ public_network_ip_addr VARCHAR(1000)
+);
+
+CREATE TABLE scheduler_stats (
+ id SERIAL PRIMARY KEY,
+ id_original BIGINT,
+ rec_time TIMESTAMP,
+ scheduler_id INT,
+ num_users INT,
+ total_held_jobs INT,
+ total_idle_jobs INT,
+ total_job_ads INT,
+ total_removed_jobs INT,
+ total_running_jobs INT
+);
+
CREATE TABLE session (
id SERIAL PRIMARY KEY,
id_original BIGINT,
@@ -560,6 +590,31 @@
tpl_outstanding_ai_os_high INT
);
+CREATE TABLE submitter (
+ id SERIAL PRIMARY KEY,
+ id_original BIGINT,
+ rec_time TIMESTAMP,
+ creation_time TIMESTAMP,
+ deletion_time TIMESTAMP,
+ managed_broker VARCHAR(1000),
+ stats_curr_id INT,
+ stats_prev_id INT,
+ job_queue_birthdate INT,
+ machine VARCHAR(1000),
+ name VARCHAR(1000),
+ schedd_name VARCHAR(1000)
+);
+
+CREATE TABLE submitter_stats (
+ id SERIAL PRIMARY KEY,
+ id_original BIGINT,
+ rec_time TIMESTAMP,
+ submitter_id INT,
+ held_jobs INT,
+ idle_jobs INT,
+ running_jobs INT
+);
+
CREATE TABLE system (
id SERIAL PRIMARY KEY,
id_original BIGINT,
@@ -696,6 +751,12 @@
ALTER TABLE queue_stats ADD CONSTRAINT queue_id_exists FOREIGN KEY (queue_id) REFERENCES queue (id) ON DELETE SET NULL;
+ALTER TABLE scheduler ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES scheduler_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE scheduler ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES scheduler_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE scheduler_stats ADD CONSTRAINT scheduler_id_exists FOREIGN KEY (scheduler_id) REFERENCES scheduler (id) ON DELETE SET NULL;
+
ALTER TABLE session ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES session_stats (id) ON DELETE SET NULL;
ALTER TABLE session ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES session_stats (id) ON DELETE SET NULL;
@@ -720,6 +781,12 @@
ALTER TABLE store_stats ADD CONSTRAINT store_id_exists FOREIGN KEY (store_id) REFERENCES store (id) ON DELETE SET NULL;
+ALTER TABLE submitter ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES submitter_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE submitter ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES submitter_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE submitter_stats ADD CONSTRAINT submitter_id_exists FOREIGN KEY (submitter_id) REFERENCES submitter (id) ON DELETE SET NULL;
+
ALTER TABLE system ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES system_stats (id) ON DELETE SET NULL;
ALTER TABLE system ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES system_stats (id) ON DELETE SET NULL;
15 years, 8 months
rhmessaging commits: r2363 - in mgmt/trunk/mint: sql and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-08-28 13:47:18 -0400 (Thu, 28 Aug 2008)
New Revision: 2363
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Updated mint schema to latest condor changes
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-08-26 18:44:04 UTC (rev 2362)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-08-28 17:47:18 UTC (rev 2363)
@@ -652,12 +652,19 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('SlotStats', cascade='null', default=None)
statsPrev = ForeignKey('SlotStats', cascade='null', default=None)
+ AccountingGroup = StringCol(length=1000, default=None)
Arch = StringCol(length=1000, default=None)
CheckpointPlatform = StringCol(length=1000, default=None)
+ ClientMachine = StringCol(length=1000, default=None)
Cpus = IntCol(default=None)
+ CurrentRank = FloatCol(default=None)
Disk = IntCol(default=None)
FileSystemDomain = StringCol(length=1000, default=None)
+ GlobalJobId = StringCol(length=1000, default=None)
+ ImageSize = IntCol(default=None)
IsValidCheckpointPlatform = StringCol(length=4000, default=None)
+ JobId = StringCol(length=1000, default=None)
+ JobStart = BigIntCol(default=None)
KFlops = IntCol(default=None)
Machine = StringCol(length=1000, default=None)
MaxJobRetirementTime = StringCol(length=4000, default=None)
@@ -666,14 +673,23 @@
MyAddress = StringCol(length=1000, default=None)
Name = StringCol(length=1000, default=None)
OpSys = StringCol(length=1000, default=None)
+ PreemptingOwner = StringCol(length=1000, default=None)
+ PreemptingUser = StringCol(length=1000, default=None)
+ PreemptingRank = FloatCol(default=None)
+ RemoteOwner = StringCol(length=1000, default=None)
+ RemoteUser = StringCol(length=1000, default=None)
Requirements = StringCol(length=4000, default=None)
PublicNetworkIpAddr = StringCol(length=1000, default=None)
Rank = StringCol(length=4000, default=None)
SlotID = IntCol(default=None)
Start = StringCol(length=4000, default=None)
StarterAbilityList = StringCol(length=4000, default=None)
+ TotalClaimRunTime = IntCol(default=None)
+ TotalClaimSuspendTime = IntCol(default=None)
TotalCpus = IntCol(default=None)
TotalDisk = IntCol(default=None)
+ TotalJobRunTime = IntCol(default=None)
+ TotalJobSuspendTime = IntCol(default=None)
TotalMemory = IntCol(default=None)
TotalSlots = IntCol(default=None)
TotalVirtualMemory = IntCol(default=None)
@@ -692,40 +708,24 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
slot = ForeignKey('Slot', cascade='null', default=None)
- AccountingGroup = StringCol(length=1000, default=None)
Activity = StringCol(length=1000, default=None)
- ClientMachine = StringCol(length=1000, default=None)
ClockDay = IntCol(default=None)
ClockMin = IntCol(default=None)
CondorLoadAvg = FloatCol(default=None)
ConsoleIdle = IntCol(default=None)
- CurrentRank = FloatCol(default=None)
- EnteredCurrentActivity = IntCol(default=None)
- EnteredCurrentState = IntCol(default=None)
- GlobalJobId = StringCol(length=1000, default=None)
- ImageSize = IntCol(default=None)
- JobId = StringCol(length=1000, default=None)
- JobStart = IntCol(default=None)
+ EnteredCurrentActivity = BigIntCol(default=None)
+ EnteredCurrentState = BigIntCol(default=None)
KeyboardIdle = IntCol(default=None)
- LastBenchmark = IntCol(default=None)
- LastFetchWorkCompleted = IntCol(default=None)
- LastFetchWorkSpawned = IntCol(default=None)
- LastPeriodicCheckpoint = IntCol(default=None)
+ LastBenchmark = BigIntCol(default=None)
+ LastFetchWorkCompleted = BigIntCol(default=None)
+ LastFetchWorkSpawned = BigIntCol(default=None)
+ LastPeriodicCheckpoint = BigIntCol(default=None)
LoadAvg = FloatCol(default=None)
- MyCurrentTime = IntCol(default=None)
- NextFetchWorkDelay = IntCol(default=None)
- PreemptingOwner = StringCol(length=1000, default=None)
- PreemptingUser = StringCol(length=1000, default=None)
- PreemptingRank = FloatCol(default=None)
- RemoteOwner = StringCol(length=1000, default=None)
- RemoteUser = StringCol(length=1000, default=None)
+ MyCurrentTime = BigIntCol(default=None)
+ NextFetchWorkDelay = BigIntCol(default=None)
State = StringCol(length=1000, default=None)
TimeToLive = IntCol(default=None)
- TotalClaimRunTime = IntCol(default=None)
- TotalClaimSuspendTime = IntCol(default=None)
TotalCondorLoadAvg = FloatCol(default=None)
- TotalJobRunTime = IntCol(default=None)
- TotalJobSuspendTime = IntCol(default=None)
TotalLoadAvg = FloatCol(default=None)
TotalTimeBackfillBusy = IntCol(default=None)
TotalTimeBackfillIdle = IntCol(default=None)
@@ -772,9 +772,8 @@
Out = StringCol(length=4000, default=None)
Owner = StringCol(length=1000, default=None)
ProcId = IntCol(default=None)
- QDate = IntCol(default=None)
+ QDate = BigIntCol(default=None)
Requirements = StringCol(length=4000, default=None)
- Scheduler = StringCol(length=1000, default=None)
Title = StringCol(length=1000, default=None)
UserLog = StringCol(length=4000, default=None)
HoldReason = StringCol(length=4000, default=None)
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-08-26 18:44:04 UTC (rev 2362)
+++ mgmt/trunk/mint/sql/schema.sql 2008-08-28 17:47:18 UTC (rev 2363)
@@ -245,9 +245,8 @@
out VARCHAR(4000),
owner VARCHAR(1000),
proc_id INT,
- q_date INT,
+ q_date BIGINT,
requirements VARCHAR(4000),
- scheduler VARCHAR(1000),
title VARCHAR(1000),
user_log VARCHAR(4000),
hold_reason VARCHAR(4000)
@@ -436,12 +435,19 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
+ accounting_group VARCHAR(1000),
arch VARCHAR(1000),
checkpoint_platform VARCHAR(1000),
+ client_machine VARCHAR(1000),
cpus INT,
+ current_rank FLOAT,
disk INT,
file_system_domain VARCHAR(1000),
+ global_job_id VARCHAR(1000),
+ image_size INT,
is_valid_checkpoint_platform VARCHAR(4000),
+ job_id VARCHAR(1000),
+ job_start BIGINT,
k_flops INT,
machine VARCHAR(1000),
max_job_retirement_time VARCHAR(4000),
@@ -450,14 +456,23 @@
my_address VARCHAR(1000),
name VARCHAR(1000),
op_sys VARCHAR(1000),
+ preempting_owner VARCHAR(1000),
+ preempting_user VARCHAR(1000),
+ preempting_rank FLOAT,
+ remote_owner VARCHAR(1000),
+ remote_user VARCHAR(1000),
requirements VARCHAR(4000),
public_network_ip_addr VARCHAR(1000),
rank VARCHAR(4000),
slot_id INT,
start VARCHAR(4000),
starter_ability_list VARCHAR(4000),
+ total_claim_run_time INT,
+ total_claim_suspend_time INT,
total_cpus INT,
total_disk INT,
+ total_job_run_time INT,
+ total_job_suspend_time INT,
total_memory INT,
total_slots INT,
total_virtual_memory INT,
@@ -473,40 +488,24 @@
id_original BIGINT,
rec_time TIMESTAMP,
slot_id INT,
- accounting_group VARCHAR(1000),
activity VARCHAR(1000),
- client_machine VARCHAR(1000),
clock_day INT,
clock_min INT,
condor_load_avg FLOAT,
console_idle INT,
- current_rank FLOAT,
- entered_current_activity INT,
- entered_current_state INT,
- global_job_id VARCHAR(1000),
- image_size INT,
- job_id VARCHAR(1000),
- job_start INT,
+ entered_current_activity BIGINT,
+ entered_current_state BIGINT,
keyboard_idle INT,
- last_benchmark INT,
- last_fetch_work_completed INT,
- last_fetch_work_spawned INT,
- last_periodic_checkpoint INT,
+ last_benchmark BIGINT,
+ last_fetch_work_completed BIGINT,
+ last_fetch_work_spawned BIGINT,
+ last_periodic_checkpoint BIGINT,
load_avg FLOAT,
- my_current_time INT,
- next_fetch_work_delay INT,
- preempting_owner VARCHAR(1000),
- preempting_user VARCHAR(1000),
- preempting_rank FLOAT,
- remote_owner VARCHAR(1000),
- remote_user VARCHAR(1000),
+ my_current_time BIGINT,
+ next_fetch_work_delay BIGINT,
state VARCHAR(1000),
time_to_live INT,
- total_claim_run_time INT,
- total_claim_suspend_time INT,
total_condor_load_avg FLOAT,
- total_job_run_time INT,
- total_job_suspend_time INT,
total_load_avg FLOAT,
total_time_backfill_busy INT,
total_time_backfill_idle INT,
15 years, 8 months
rhmessaging commits: r2362 - store/branches/mrg-1.0/cpp/rhel4-support.
by rhmessaging-commits＠lists.jboss.org
Author: gordonsim
Date: 2008-08-26 14:44:04 -0400 (Tue, 26 Aug 2008)
New Revision: 2362
Modified:
store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch
Log:
Updated suppressions to cover what appears to be similar cases with slightly different stack traces when compiled against installed headers/libs.
Modified: store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch
===================================================================
--- store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch 2008-08-26 17:51:43 UTC (rev 2361)
+++ store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch 2008-08-26 18:44:04 UTC (rev 2362)
@@ -1,8 +1,8 @@
Index: tests/.valgrind.supp
===================================================================
---- tests/.valgrind.supp (revision 2179)
+--- tests/.valgrind.supp (revision 2357)
+++ tests/.valgrind.supp (working copy)
-@@ -1,32 +1,205 @@
+@@ -1,32 +1,241 @@
{
- Benign error in libcpg.
- Memcheck:Param
@@ -19,12 +19,7 @@
+ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
+ fun:_ZN4qpid3log6LoggerC1Ev
}
--
- {
-- Uninitialised value problem in _dl_relocate (F7, F8)
-- Memcheck:Cond
-- fun:_dl_relocate_object
-- fun:*dl_*
++{
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:_Znwm
@@ -33,23 +28,16 @@
+ fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
+ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
+ fun:_ZN4qpid3log6LoggerC1Ev
- }
--
- {
-- False "possibly leaked" in boost program_options - global std::string var.
++}
++{
+ <insert a suppression name here>
- Memcheck:Leak
-- fun:_Znwj
-- fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
-- obj:/usr/lib/libstdc++.so.6.0.8
-- fun:_ZNSsC1EPKcRKSaIcE
-- obj:/usr/lib/libboost_program_options.so.1.33.1
++ Memcheck:Leak
+ fun:_Znwm
+ fun:_ZN5boost15program_options29options_description_easy_initclEPKcPKNS0_14value_semanticES3_
+ fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
+ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
+ fun:_ZN4qpid3log6LoggerC1Ev
- }
++}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
@@ -84,10 +72,10 @@
+}
{
-- Bogus epoll_ctl error on i386
-- Memcheck:Param
-- epoll_ctl(event)
-- fun:epoll_ctl
+- Uninitialised value problem in _dl_relocate (F7, F8)
+- Memcheck:Cond
+- fun:_dl_relocate_object
+- fun:*dl_*
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:malloc
@@ -221,17 +209,63 @@
+ fun:_Z8tryShlibPKcb
+ fun:main
+}
+
++#following additions seem to be required when running make check
++#against an installation:
+ {
+- False "possibly leaked" in boost program_options - global std::string var.
++ <insert a suppression name here>
+ Memcheck:Leak
+- fun:_Znwj
+- fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
+- obj:/usr/lib/libstdc++.so.6.0.8
+- fun:_ZNSsC1EPKcRKSaIcE
+- obj:/usr/lib/libboost_program_options.so.1.33.1
++ fun:_Znwm
++ fun:_ZN5boost15program_options19options_description3addERKS1_
++ fun:main
+ }
+
+ {
+- Bogus epoll_ctl error on i386
+- Memcheck:Param
+- epoll_ctl(event)
+- fun:epoll_ctl
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:_Znwm
++ fun:_ZN5boost15program_options29options_description_easy_initclEPKcS3_
++ fun:_ZN3rhm3jtt4argsC1ESs
+ }
+
+{
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:_Znwm
-+ fun:_ZN5boost15program_options19options_description3addERKS1_
-+ fun:main
++ fun:_ZN5boost15program_options29options_description_easy_initclEPKcPKNS0_14value_semanticES3_
++ fun:_ZN3rhm3jtt4argsC1ESs
+}
-
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:_Znwm
++ fun:_ZN9__gnu_cxx13new_allocatorISsE8allocateEmPKv
++ fun:_ZNSt12_Vector_baseISsSaISsEE11_M_allocateEm
++ fun:_ZNSt6vectorISsSaISsEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPSsS1_EERKSs
++ fun:_ZN4qpid7Options14register_namesESs
++ fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:calloc
++ fun:_dl_allocate_tls
++ fun:pthread_create@@GLIBC_2.2.5
++ fun:_ZN3rhm3jtt13jrnl_instance6run_tcEv
++}
Index: configure.ac
===================================================================
---- configure.ac (revision 2179)
+--- configure.ac (revision 2357)
+++ configure.ac (working copy)
@@ -54,7 +54,6 @@
# -Wshadow - warns about boost headers.
@@ -251,7 +285,7 @@
AC_SUBST([WARNING_CFLAGS], [$COMPILER_FLAGS])
Index: lib/BdbMessageStore.cpp
===================================================================
---- lib/BdbMessageStore.cpp (revision 2179)
+--- lib/BdbMessageStore.cpp (revision 2357)
+++ lib/BdbMessageStore.cpp (working copy)
@@ -226,10 +226,6 @@
try {
@@ -266,7 +300,7 @@
Index: Makefile.am
===================================================================
---- Makefile.am (revision 2179)
+--- Makefile.am (revision 2357)
+++ Makefile.am (working copy)
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = 1.9.6 foreign
15 years, 8 months
rhmessaging commits: r2361 - in mgmt/trunk: mint/python/mint and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-08-26 13:51:43 -0400 (Tue, 26 Aug 2008)
New Revision: 2361
Added:
mgmt/trunk/cumin/python/cumin/job.py
mgmt/trunk/cumin/python/cumin/job.strings
Modified:
mgmt/trunk/cumin/python/cumin/pool.py
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Update to the latest schema files, and add rudimentary job listing
Added: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py (rev 0)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-08-26 17:51:43 UTC (rev 2361)
@@ -0,0 +1,38 @@
+import logging
+
+from wooly import *
+from wooly.widgets import *
+from wooly.forms import *
+from wooly.resources import *
+from wooly.tables import *
+
+from stat import *
+from widgets import *
+from parameters import *
+from formats import *
+from util import *
+
+strings = StringCatalog(__file__)
+log = logging.getLogger("cumin.job")
+
+class JobSet(CuminTable):
+ def __init__(self, app, name):
+ super(JobSet, self).__init__(app, name)
+
+ col = self.CommandColumn(app, "name")
+ self.add_column(col)
+
+ self.set_default_column(col)
+
+ def render_title(self, session):
+ return "Jobs %s" % fmt_count(Job.select().count())
+
+ class CommandColumn(SqlTableColumn):
+ def render_title(self, session, data):
+ return "Command"
+
+ def render_content(self, session, data):
+ job = Identifiable(data["id"])
+ branch = session.branch()
+ self.frame.show_job(branch, job).show_view(branch)
+ return fmt_olink(branch, job, name=data["cmd"])
Added: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings (rev 0)
+++ mgmt/trunk/cumin/python/cumin/job.strings 2008-08-26 17:51:43 UTC (rev 2361)
@@ -0,0 +1,8 @@
+[JobSet.sql]
+select
+ j.id,
+ j.cmd
+from job as j
+
+[JobSet.count_sql]
+select count(*) from pool
Modified: mgmt/trunk/cumin/python/cumin/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/pool.py 2008-08-26 15:06:01 UTC (rev 2360)
+++ mgmt/trunk/cumin/python/cumin/pool.py 2008-08-26 17:51:43 UTC (rev 2361)
@@ -11,6 +11,7 @@
from parameters import *
from formats import *
from util import *
+from job import JobSet
strings = StringCatalog(__file__)
log = logging.getLogger("cumin.pool")
@@ -48,6 +49,9 @@
self.add_mode(view)
self.set_view_mode(view)
+ def show_job(self, session, job):
+ return self
+
class PoolView(CuminView):
def __init__(self, app, name):
super(PoolView, self).__init__(app, name)
@@ -58,6 +62,12 @@
self.__tabs = TabbedModeSet(app, "tabs")
self.add_child(self.__tabs)
+ jobs = self.JobsTab(app, "jobs")
+ self.__tabs.add_tab(jobs)
+
+ class JobsTab(JobSet):
+ pass
+
class PoolStatus(CuminStatus):
pass
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-08-26 15:06:01 UTC (rev 2360)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-08-26 17:51:43 UTC (rev 2361)
@@ -54,7 +54,6 @@
mgmtPubInterval = SmallIntCol(default=None)
clusterName = StringCol(length=1000, default=None)
version = StringCol(length=1000, default=None)
- dataDirEnabled = BoolCol(default=None)
dataDir = StringCol(length=1000, default=None)
classInfos = dict() # brokerId => classInfo
@@ -535,9 +534,15 @@
statsPrev = ForeignKey('StoreStats', cascade='null', default=None)
broker = ForeignKey('Broker', cascade='null', default=None)
location = StringCol(length=1000, default=None)
- async = BoolCol(default=None)
defaultInitialFileCount = SmallIntCol(default=None)
defaultDataFileSize = IntCol(default=None)
+ tplIsInitialized = BoolCol(default=None)
+ tplDirectory = StringCol(length=1000, default=None)
+ tplWritePageSize = IntCol(default=None)
+ tplWritePages = IntCol(default=None)
+ tplInitialFileCount = SmallIntCol(default=None)
+ tplDataFileSize = IntCol(default=None)
+ tplCurrentFileCount = IntCol(default=None)
classInfos = dict() # brokerId => classInfo
@@ -548,6 +553,15 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
store = ForeignKey('Store', cascade='null', default=None)
+ tplTransactionDepth = IntCol(default=None)
+ tplTransactionDepthLow = IntCol(default=None)
+ tplTransactionDepthHigh = IntCol(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)
classInfos = dict() # brokerId => classInfo
@@ -564,14 +578,17 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('JournalStats', cascade='null', default=None)
statsPrev = ForeignKey('JournalStats', cascade='null', default=None)
+ queue = ForeignKey('Queue', cascade='null', default=None)
name = StringCol(length=1000, default=None)
- queue = ForeignKey('Queue', cascade='null', default=None)
directory = StringCol(length=1000, default=None)
baseFileName = StringCol(length=1000, default=None)
writePageSize = IntCol(default=None)
writePages = IntCol(default=None)
readPageSize = IntCol(default=None)
readPages = IntCol(default=None)
+ initialFileCount = SmallIntCol(default=None)
+ dataFileSize = IntCol(default=None)
+ currentFileCount = IntCol(default=None)
classInfos = dict() # brokerId => classInfo
@@ -591,14 +608,15 @@
idOriginal = BigIntCol(default=None)
recTime = TimestampCol(default=None)
journal = ForeignKey('Journal', cascade='null', default=None)
- initialFileCount = SmallIntCol(default=None)
- dataFileSize = IntCol(default=None)
- currentFileCount = IntCol(default=None)
recordDepth = IntCol(default=None)
recordDepthLow = IntCol(default=None)
recordDepthHigh = IntCol(default=None)
- recordEnqueues = BigIntCol(default=None)
- recordDequeues = 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)
@@ -623,6 +641,158 @@
+class Slot(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ idOriginal = BigIntCol(default=None)
+ recTime = TimestampCol(default=None)
+ creationTime = TimestampCol(default=None)
+ deletionTime = TimestampCol(default=None)
+ managedBroker = StringCol(length=1000, default=None)
+ statsCurr = ForeignKey('SlotStats', cascade='null', default=None)
+ statsPrev = ForeignKey('SlotStats', cascade='null', default=None)
+ Arch = StringCol(length=1000, default=None)
+ CheckpointPlatform = StringCol(length=1000, default=None)
+ Cpus = IntCol(default=None)
+ Disk = IntCol(default=None)
+ FileSystemDomain = StringCol(length=1000, default=None)
+ IsValidCheckpointPlatform = StringCol(length=4000, default=None)
+ KFlops = IntCol(default=None)
+ Machine = StringCol(length=1000, default=None)
+ MaxJobRetirementTime = StringCol(length=4000, default=None)
+ Memory = IntCol(default=None)
+ Mips = IntCol(default=None)
+ MyAddress = StringCol(length=1000, default=None)
+ Name = StringCol(length=1000, default=None)
+ OpSys = StringCol(length=1000, default=None)
+ Requirements = StringCol(length=4000, default=None)
+ PublicNetworkIpAddr = StringCol(length=1000, default=None)
+ Rank = StringCol(length=4000, default=None)
+ SlotID = IntCol(default=None)
+ Start = StringCol(length=4000, default=None)
+ StarterAbilityList = StringCol(length=4000, default=None)
+ TotalCpus = IntCol(default=None)
+ TotalDisk = IntCol(default=None)
+ TotalMemory = IntCol(default=None)
+ TotalSlots = IntCol(default=None)
+ TotalVirtualMemory = IntCol(default=None)
+ UidDomain = StringCol(length=1000, default=None)
+ VirtualMemory = IntCol(default=None)
+ WindowsBuildNumber = IntCol(default=None)
+ WindowsMajorVersion = IntCol(default=None)
+ WindowsMinorVersion = IntCol(default=None)
+
+ classInfos = dict() # brokerId => classInfo
+
+class SlotStats(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ idOriginal = BigIntCol(default=None)
+ recTime = TimestampCol(default=None)
+ slot = ForeignKey('Slot', cascade='null', default=None)
+ AccountingGroup = StringCol(length=1000, default=None)
+ Activity = StringCol(length=1000, default=None)
+ ClientMachine = StringCol(length=1000, default=None)
+ ClockDay = IntCol(default=None)
+ ClockMin = IntCol(default=None)
+ CondorLoadAvg = FloatCol(default=None)
+ ConsoleIdle = IntCol(default=None)
+ CurrentRank = FloatCol(default=None)
+ EnteredCurrentActivity = IntCol(default=None)
+ EnteredCurrentState = IntCol(default=None)
+ GlobalJobId = StringCol(length=1000, default=None)
+ ImageSize = IntCol(default=None)
+ JobId = StringCol(length=1000, default=None)
+ JobStart = IntCol(default=None)
+ KeyboardIdle = IntCol(default=None)
+ LastBenchmark = IntCol(default=None)
+ LastFetchWorkCompleted = IntCol(default=None)
+ LastFetchWorkSpawned = IntCol(default=None)
+ LastPeriodicCheckpoint = IntCol(default=None)
+ LoadAvg = FloatCol(default=None)
+ MyCurrentTime = IntCol(default=None)
+ NextFetchWorkDelay = IntCol(default=None)
+ PreemptingOwner = StringCol(length=1000, default=None)
+ PreemptingUser = StringCol(length=1000, default=None)
+ PreemptingRank = FloatCol(default=None)
+ RemoteOwner = StringCol(length=1000, default=None)
+ RemoteUser = StringCol(length=1000, default=None)
+ State = StringCol(length=1000, default=None)
+ TimeToLive = IntCol(default=None)
+ TotalClaimRunTime = IntCol(default=None)
+ TotalClaimSuspendTime = IntCol(default=None)
+ TotalCondorLoadAvg = FloatCol(default=None)
+ TotalJobRunTime = IntCol(default=None)
+ TotalJobSuspendTime = IntCol(default=None)
+ TotalLoadAvg = FloatCol(default=None)
+ TotalTimeBackfillBusy = IntCol(default=None)
+ TotalTimeBackfillIdle = IntCol(default=None)
+ TotalTimeBackfillKilling = IntCol(default=None)
+ TotalTimeClaimedBusy = IntCol(default=None)
+ TotalTimeClaimedIdle = IntCol(default=None)
+ TotalTimeClaimedRetiring = IntCol(default=None)
+ TotalTimeClaimedSuspended = IntCol(default=None)
+ TotalTimeMatchedIdle = IntCol(default=None)
+ TotalTimeOwnerIdle = IntCol(default=None)
+ TotalTimePreemptingKilling = IntCol(default=None)
+ TotalTimePreemptingVacating = IntCol(default=None)
+ TotalTimeUnclaimedBenchmarking = IntCol(default=None)
+ TotalTimeUnclaimedIdle = IntCol(default=None)
+
+ classInfos = dict() # brokerId => classInfo
+
+
+
+class Job(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ idOriginal = BigIntCol(default=None)
+ recTime = TimestampCol(default=None)
+ creationTime = TimestampCol(default=None)
+ deletionTime = TimestampCol(default=None)
+ managedBroker = StringCol(length=1000, default=None)
+ statsCurr = ForeignKey('JobStats', cascade='null', default=None)
+ statsPrev = ForeignKey('JobStats', cascade='null', default=None)
+ AccountingGroup = StringCol(length=1000, default=None)
+ Args = StringCol(length=4000, default=None)
+ ClusterId = IntCol(default=None)
+ Cmd = StringCol(length=4000, default=None)
+ ConcurrencyLimits = StringCol(length=4000, default=None)
+ CustomGroup = StringCol(length=1000, default=None)
+ CustomId = StringCol(length=1000, default=None)
+ CustomPriority = IntCol(default=None)
+ GlobalJobId = StringCol(length=1000, default=None)
+ InRsv = StringCol(length=4000, default=None)
+ Iwd = StringCol(length=4000, default=None)
+ JobStatus = IntCol(default=None)
+ Note = StringCol(length=4000, default=None)
+ Out = StringCol(length=4000, default=None)
+ Owner = StringCol(length=1000, default=None)
+ ProcId = IntCol(default=None)
+ QDate = IntCol(default=None)
+ Requirements = StringCol(length=4000, default=None)
+ Scheduler = StringCol(length=1000, default=None)
+ Title = StringCol(length=1000, default=None)
+ UserLog = StringCol(length=4000, default=None)
+ HoldReason = StringCol(length=4000, default=None)
+
+ classInfos = dict() # brokerId => classInfo
+
+class JobStats(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ idOriginal = BigIntCol(default=None)
+ recTime = TimestampCol(default=None)
+ job = ForeignKey('Job', cascade='null', default=None)
+
+ classInfos = dict() # brokerId => classInfo
+
+
+
classToSchemaNameMap = dict()
schemaNameToClassMap = dict()
classToSchemaNameMap['System'] = 'System'
@@ -730,3 +900,13 @@
Journal.sqlmeta.addJoin(SQLMultipleJoin('JournalStats', joinMethodName='stats'))
+classToSchemaNameMap['Slot'] = 'slot'
+schemaNameToClassMap['slot'] = Slot
+
+Slot.sqlmeta.addJoin(SQLMultipleJoin('SlotStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Job'] = 'Job'
+schemaNameToClassMap['Job'] = Job
+
+Job.sqlmeta.addJoin(SQLMultipleJoin('JobStats', joinMethodName='stats'))
+
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-08-26 15:06:01 UTC (rev 2360)
+++ mgmt/trunk/mint/sql/schema.sql 2008-08-26 17:51:43 UTC (rev 2361)
@@ -148,7 +148,6 @@
mgmt_pub_interval SMALLINT,
cluster_name VARCHAR(1000),
version VARCHAR(1000),
- data_dir_enabled BOOL,
data_dir VARCHAR(1000),
registration_id INT
);
@@ -221,6 +220,46 @@
byte_routes BIGINT
);
+CREATE TABLE job (
+ id SERIAL PRIMARY KEY,
+ id_original BIGINT,
+ rec_time TIMESTAMP,
+ creation_time TIMESTAMP,
+ deletion_time TIMESTAMP,
+ managed_broker VARCHAR(1000),
+ stats_curr_id INT,
+ stats_prev_id INT,
+ accounting_group VARCHAR(1000),
+ args VARCHAR(4000),
+ cluster_id INT,
+ cmd VARCHAR(4000),
+ concurrency_limits VARCHAR(4000),
+ custom_group VARCHAR(1000),
+ custom_id VARCHAR(1000),
+ custom_priority INT,
+ global_job_id VARCHAR(1000),
+ in_rsv VARCHAR(4000),
+ iwd VARCHAR(4000),
+ job_status INT,
+ note VARCHAR(4000),
+ out VARCHAR(4000),
+ owner VARCHAR(1000),
+ proc_id INT,
+ q_date INT,
+ requirements VARCHAR(4000),
+ scheduler VARCHAR(1000),
+ title VARCHAR(1000),
+ user_log VARCHAR(4000),
+ hold_reason VARCHAR(4000)
+);
+
+CREATE TABLE job_stats (
+ id SERIAL PRIMARY KEY,
+ id_original BIGINT,
+ rec_time TIMESTAMP,
+ job_id INT
+);
+
CREATE TABLE journal (
id SERIAL PRIMARY KEY,
id_original BIGINT,
@@ -230,14 +269,17 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
+ queue_id INT,
name VARCHAR(1000),
- queue_id INT,
directory VARCHAR(1000),
base_file_name VARCHAR(1000),
write_page_size INT,
write_pages INT,
read_page_size INT,
- read_pages INT
+ read_pages INT,
+ initial_file_count SMALLINT,
+ data_file_size INT,
+ current_file_count INT
);
CREATE TABLE journal_stats (
@@ -245,14 +287,15 @@
id_original BIGINT,
rec_time TIMESTAMP,
journal_id INT,
- initial_file_count SMALLINT,
- data_file_size INT,
- current_file_count INT,
record_depth INT,
record_depth_low INT,
record_depth_high INT,
- record_enqueues BIGINT,
- record_dequeues 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,
@@ -384,6 +427,102 @@
frames_outstanding INT
);
+CREATE TABLE slot (
+ id SERIAL PRIMARY KEY,
+ id_original BIGINT,
+ rec_time TIMESTAMP,
+ creation_time TIMESTAMP,
+ deletion_time TIMESTAMP,
+ managed_broker VARCHAR(1000),
+ stats_curr_id INT,
+ stats_prev_id INT,
+ arch VARCHAR(1000),
+ checkpoint_platform VARCHAR(1000),
+ cpus INT,
+ disk INT,
+ file_system_domain VARCHAR(1000),
+ is_valid_checkpoint_platform VARCHAR(4000),
+ k_flops INT,
+ machine VARCHAR(1000),
+ max_job_retirement_time VARCHAR(4000),
+ memory INT,
+ mips INT,
+ my_address VARCHAR(1000),
+ name VARCHAR(1000),
+ op_sys VARCHAR(1000),
+ requirements VARCHAR(4000),
+ public_network_ip_addr VARCHAR(1000),
+ rank VARCHAR(4000),
+ slot_id INT,
+ start VARCHAR(4000),
+ starter_ability_list VARCHAR(4000),
+ total_cpus INT,
+ total_disk INT,
+ total_memory INT,
+ total_slots INT,
+ total_virtual_memory INT,
+ uid_domain VARCHAR(1000),
+ virtual_memory INT,
+ windows_build_number INT,
+ windows_major_version INT,
+ windows_minor_version INT
+);
+
+CREATE TABLE slot_stats (
+ id SERIAL PRIMARY KEY,
+ id_original BIGINT,
+ rec_time TIMESTAMP,
+ slot_id INT,
+ accounting_group VARCHAR(1000),
+ activity VARCHAR(1000),
+ client_machine VARCHAR(1000),
+ clock_day INT,
+ clock_min INT,
+ condor_load_avg FLOAT,
+ console_idle INT,
+ current_rank FLOAT,
+ entered_current_activity INT,
+ entered_current_state INT,
+ global_job_id VARCHAR(1000),
+ image_size INT,
+ job_id VARCHAR(1000),
+ job_start INT,
+ keyboard_idle INT,
+ last_benchmark INT,
+ last_fetch_work_completed INT,
+ last_fetch_work_spawned INT,
+ last_periodic_checkpoint INT,
+ load_avg FLOAT,
+ my_current_time INT,
+ next_fetch_work_delay INT,
+ preempting_owner VARCHAR(1000),
+ preempting_user VARCHAR(1000),
+ preempting_rank FLOAT,
+ remote_owner VARCHAR(1000),
+ remote_user VARCHAR(1000),
+ state VARCHAR(1000),
+ time_to_live INT,
+ total_claim_run_time INT,
+ total_claim_suspend_time INT,
+ total_condor_load_avg FLOAT,
+ total_job_run_time INT,
+ total_job_suspend_time INT,
+ total_load_avg FLOAT,
+ total_time_backfill_busy INT,
+ total_time_backfill_idle INT,
+ total_time_backfill_killing INT,
+ total_time_claimed_busy INT,
+ total_time_claimed_idle INT,
+ total_time_claimed_retiring INT,
+ total_time_claimed_suspended INT,
+ total_time_matched_idle INT,
+ total_time_owner_idle INT,
+ total_time_preempting_killing INT,
+ total_time_preempting_vacating INT,
+ total_time_unclaimed_benchmarking INT,
+ total_time_unclaimed_idle INT
+);
+
CREATE TABLE store (
id SERIAL PRIMARY KEY,
id_original BIGINT,
@@ -395,16 +534,31 @@
stats_prev_id INT,
broker_id INT,
location VARCHAR(1000),
- async BOOL,
default_initial_file_count SMALLINT,
- default_data_file_size INT
+ default_data_file_size INT,
+ tpl_is_initialized BOOL,
+ tpl_directory VARCHAR(1000),
+ tpl_write_page_size INT,
+ tpl_write_pages INT,
+ tpl_initial_file_count SMALLINT,
+ tpl_data_file_size INT,
+ tpl_current_file_count INT
);
CREATE TABLE store_stats (
id SERIAL PRIMARY KEY,
id_original BIGINT,
rec_time TIMESTAMP,
- store_id INT
+ store_id INT,
+ tpl_transaction_depth INT,
+ tpl_transaction_depth_low INT,
+ tpl_transaction_depth_high INT,
+ 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
);
CREATE TABLE system (
@@ -513,6 +667,12 @@
ALTER TABLE exchange_stats ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL;
+ALTER TABLE job ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES job_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE job ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES job_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE job_stats ADD CONSTRAINT job_id_exists FOREIGN KEY (job_id) REFERENCES job (id) ON DELETE SET NULL;
+
ALTER TABLE journal ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES journal_stats (id) ON DELETE SET NULL;
ALTER TABLE journal ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES journal_stats (id) ON DELETE SET NULL;
@@ -547,6 +707,12 @@
ALTER TABLE session_stats ADD CONSTRAINT session_id_exists FOREIGN KEY (session_id) REFERENCES session (id) ON DELETE SET NULL;
+ALTER TABLE slot ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES slot_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE slot ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES slot_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE slot_stats ADD CONSTRAINT slot_id_exists FOREIGN KEY (slot_id) REFERENCES slot (id) ON DELETE SET NULL;
+
ALTER TABLE store ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES store_stats (id) ON DELETE SET NULL;
ALTER TABLE store ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES store_stats (id) ON DELETE SET NULL;
15 years, 8 months
rhmessaging commits: r2360 - mgmt/trunk/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-08-26 11:06:01 -0400 (Tue, 26 Aug 2008)
New Revision: 2360
Modified:
mgmt/trunk/cumin/python/wooly/tables.strings
Log:
Align bottom of up sort arrow with bottom of text
Modified: mgmt/trunk/cumin/python/wooly/tables.strings
===================================================================
--- mgmt/trunk/cumin/python/wooly/tables.strings 2008-08-26 14:59:13 UTC (rev 2359)
+++ mgmt/trunk/cumin/python/wooly/tables.strings 2008-08-26 15:06:01 UTC (rev 2360)
@@ -28,16 +28,16 @@
}
a.ItemTableColumnHeader span.unsorted_down:hover {
- background: url(resource?name=sort-arrow-down.png) right 5px no-repeat;
+ background: url(resource?name=sort-arrow-down.png) right 4px no-repeat;
}
a.ItemTableColumnHeader span.unsorted_up:hover {
- background: url(resource?name=sort-arrow-up.png) right 5px no-repeat;
+ background: url(resource?name=sort-arrow-up.png) right 3px no-repeat;
}
a.ItemTableColumnHeader span.up {
- background: url(resource?name=sort-arrow-up.png) right 5px no-repeat;
+ background: url(resource?name=sort-arrow-up.png) right 3px no-repeat;
}
a.ItemTableColumnHeader span.down {
- background: url(resource?name=sort-arrow-down.png) right 5px no-repeat;
+ background: url(resource?name=sort-arrow-down.png) right 4px no-repeat;
}
[ItemTableColumnHeader.html]
15 years, 8 months
rhmessaging commits: r2359 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-08-26 10:59:13 -0400 (Tue, 26 Aug 2008)
New Revision: 2359
Modified:
mgmt/trunk/cumin/python/cumin/broker.py
mgmt/trunk/cumin/python/cumin/brokerlink.py
mgmt/trunk/cumin/python/cumin/exchange.py
mgmt/trunk/cumin/python/cumin/queue.py
mgmt/trunk/cumin/python/cumin/system.py
Log:
Manually set the default sort column
Modified: mgmt/trunk/cumin/python/cumin/broker.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.py 2008-08-26 14:58:03 UTC (rev 2358)
+++ mgmt/trunk/cumin/python/cumin/broker.py 2008-08-26 14:59:13 UTC (rev 2359)
@@ -27,6 +27,7 @@
col = self.NameColumn(app, "name")
self.add_column(col)
+ self.set_default_column(col)
col = self.GroupsColumn(app, "groups")
self.add_column(col)
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-08-26 14:58:03 UTC (rev 2358)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-08-26 14:59:13 UTC (rev 2359)
@@ -23,6 +23,7 @@
col = self.AddressColumn(app, "addr")
self.add_column(col)
+ self.set_default_column(col)
col = self.DurableColumn(app, "durable")
self.add_column(col)
@@ -133,6 +134,7 @@
col = self.ExchangeColumn(app, "exchange")
self.add_column(col)
+ self.set_default_column(col)
col = self.KeyColumn(app, "key")
self.add_column(col)
Modified: mgmt/trunk/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/exchange.py 2008-08-26 14:58:03 UTC (rev 2358)
+++ mgmt/trunk/cumin/python/cumin/exchange.py 2008-08-26 14:59:13 UTC (rev 2359)
@@ -41,6 +41,7 @@
col = self.NameColumn(app, "name")
self.add_column(col)
+ self.set_default_column(col)
col = self.ProducersColumn(app, "name")
col.alignment = "right"
@@ -306,6 +307,7 @@
self.add_child(self.__remove)
self.show_column("q_id")
+ self.set_default_column_name("q_id")
def render_title(self, session, exchange):
return "Queue Bindings %s" % \
Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py 2008-08-26 14:58:03 UTC (rev 2358)
+++ mgmt/trunk/cumin/python/cumin/queue.py 2008-08-26 14:59:13 UTC (rev 2359)
@@ -288,6 +288,7 @@
self.add_child(self.__remove)
self.show_column("e_id")
+ self.set_default_column_name("e_id")
def render_add_queue_binding_url(self, session, vhost):
branch = session.branch()
Modified: mgmt/trunk/cumin/python/cumin/system.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.py 2008-08-26 14:58:03 UTC (rev 2358)
+++ mgmt/trunk/cumin/python/cumin/system.py 2008-08-26 14:59:13 UTC (rev 2359)
@@ -19,6 +19,7 @@
col = self.NameColumn(app, "name")
self.add_column(col)
+ self.set_default_column(col)
def render_title(self, session, *args):
count = System.select().count()
15 years, 8 months
rhmessaging commits: r2358 - mgmt/trunk/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-08-26 10:58:03 -0400 (Tue, 26 Aug 2008)
New Revision: 2358
Modified:
mgmt/trunk/cumin/python/wooly/tables.py
mgmt/trunk/cumin/python/wooly/tables.strings
Log:
Tweaking column header spacing and alignment
Modified: mgmt/trunk/cumin/python/wooly/tables.py
===================================================================
--- mgmt/trunk/cumin/python/wooly/tables.py 2008-08-26 13:40:49 UTC (rev 2357)
+++ mgmt/trunk/cumin/python/wooly/tables.py 2008-08-26 14:58:03 UTC (rev 2358)
@@ -55,6 +55,9 @@
def set_default_column(self, column):
self.scolumn.default = column.name
+ def set_default_column_name(self, name):
+ self.scolumn.default = name
+
def is_reversed(self, session):
return self.reversed.get(session)
Modified: mgmt/trunk/cumin/python/wooly/tables.strings
===================================================================
--- mgmt/trunk/cumin/python/wooly/tables.strings 2008-08-26 13:40:49 UTC (rev 2357)
+++ mgmt/trunk/cumin/python/wooly/tables.strings 2008-08-26 14:58:03 UTC (rev 2358)
@@ -8,36 +8,37 @@
<tr>{cells}</tr>
[ItemTableColumnHeader.css]
-a.ItemTableColumnHeader span{
+a.ItemTableColumnHeader > span {
border:1px solid transparent;
- padding: 2px 14px 2px 4px;
+ padding: 2px 4px;
+ position: relative;
+ left: -5px; /* 4 padding + 1 border */
}
-a.ItemTableColumnHeader span:hover {
+a.ItemTableColumnHeader > span:hover {
border:1px solid #EAEAEA;
background-color: #FFFFFF;
- background-repeat: no-repeat;
- background-position: right 5px;
}
+a.ItemTableColumnHeader > span > span {
+ padding-right: 14px;
+}
+
+/* for right align columns, align with the right */
+th.ralign a.ItemTableColumnHeader > span {
+ left:19px;
+}
+
a.ItemTableColumnHeader span.unsorted_down:hover {
- background-image: url(resource?name=sort-arrow-down.png);
- background-repeat: no-repeat;
- background-position: right 5px;
+ background: url(resource?name=sort-arrow-down.png) right 5px no-repeat;
}
a.ItemTableColumnHeader span.unsorted_up:hover {
- background-image: url(resource?name=sort-arrow-up.png);
- background-repeat: no-repeat;
- background-position: right 5px;
+ background: url(resource?name=sort-arrow-up.png) right 5px no-repeat;
}
a.ItemTableColumnHeader span.up {
- background-image: url(resource?name=sort-arrow-up.png);
- background-repeat: no-repeat;
- background-position: right 5px;
+ background: url(resource?name=sort-arrow-up.png) right 5px no-repeat;
}
a.ItemTableColumnHeader span.down {
- background-image: url(resource?name=sort-arrow-down.png);
- background-repeat: no-repeat;
- background-position: right 5px;
+ background: url(resource?name=sort-arrow-down.png) right 5px no-repeat;
}
[ItemTableColumnHeader.html]
-<th {class_attr}><a class="ItemTableColumnHeader" href="{href}"><span class="{sorted_dir}">{content}</span></a></th>
+<th {class_attr}><a class="ItemTableColumnHeader" href="{href}"><span><span class="{sorted_dir}">{content}</span></span></a></th>
15 years, 8 months