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;