1:55 p.m.
Author: eallen
Date: 2009-04-20 14:55:47 -0400 (Mon, 20 Apr 2009)
New Revision: 3313
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/Makefile
mgmt/trunk/mint/sql/schema.sql
mgmt/trunk/mint/sql/triggers.sql
Log:
Latest make of schema files
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2009-04-20 18:54:45 UTC (rev 3312)
+++ mgmt/trunk/mint/python/mint/schema.py 2009-04-20 18:55:47 UTC (rev 3313)
@@ -441,6 +441,12 @@
qmfUpdateTime = TimestampCol(default=None)
collector = ForeignKey('Collector', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
+ RunningJobs = BigIntCol(default=None)
+ IdleJobs = BigIntCol(default=None)
+ HostsTotal = BigIntCol(default=None)
+ HostsClaimed = BigIntCol(default=None)
+ HostsUnclaimed = BigIntCol(default=None)
+ HostsOwner = BigIntCol(default=None)
@@ -509,6 +515,50 @@
+class Grid(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ 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('GridStats', cascade='null', default=None)
+ statsCurrIndex = DatabaseIndex(statsCurr)
+ statsPrev = ForeignKey('GridStats', cascade='null', default=None)
+ statsPrevIndex = DatabaseIndex(statsPrev)
+ classInfos = dict() # brokerId => classInfo
+ Pool = StringCol(length=1000, default=None)
+ Name = StringCol(length=1000, default=None)
+ ScheddName = StringCol(length=1000, default=None)
+ Owner = StringCol(length=1000, default=None)
+ JobLimit = BigIntCol(default=None)
+ SubmitLimit = BigIntCol(default=None)
+ GridResourceUnavailableTime = TimestampCol(default=None)
+
+
+class GridStats(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ qmfUpdateTime = TimestampCol(default=None)
+ grid = ForeignKey('Grid', cascade='null', default=None)
+ classInfos = dict() # brokerId => classInfo
+ NumJobs = BigIntCol(default=None)
+ SubmitsInProgress = BigIntCol(default=None)
+ SubmitsQueued = BigIntCol(default=None)
+ SubmitsAllowed = BigIntCol(default=None)
+ SubmitsWanted = BigIntCol(default=None)
+ RunningJobs = BigIntCol(default=None)
+ IdleJobs = BigIntCol(default=None)
+
+
+
+
class Acl(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -572,14 +622,18 @@
broker = ForeignKey('Broker', cascade='null', default=None)
clusterName = StringCol(length=1000, default=None)
clusterID = StringCol(length=1000, default=None)
+ memberID = StringCol(length=1000, default=None)
publishedURL = StringCol(length=1000, default=None)
clusterSize = IntCol(default=None)
status = StringCol(length=1000, default=None)
members = StringCol(length=4000, default=None)
+ memberIDs = StringCol(length=4000, default=None)
- def stopClusterNode(self, model, callback):
+ def stopClusterNode(self, model, callback, brokerId):
actualArgs = list()
+ if brokerId is not None:
+ actualArgs.append(brokerId)
originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey,
"stopClusterNode",
callback, args=actualArgs)
@@ -677,8 +731,10 @@
readPageSize = BigIntCol(default=None)
readPages = BigIntCol(default=None)
initialFileCount = IntCol(default=None)
+ autoExpand = BoolCol(default=None)
+ currentFileCount = IntCol(default=None)
+ maxFileCount = IntCol(default=None)
dataFileSize = BigIntCol(default=None)
- currentFileCount = BigIntCol(default=None)
def expand(self, model, callback, by):
@@ -702,6 +758,7 @@
recordDepthHigh = BigIntCol(default=None)
enqueues = BigIntCol(default=None)
dequeues = BigIntCol(default=None)
+ txn = BigIntCol(default=None)
txnEnqueues = BigIntCol(default=None)
txnDequeues = BigIntCol(default=None)
txnCommits = BigIntCol(default=None)
@@ -845,6 +902,7 @@
qmfUpdateTime = TimestampCol(default=None)
broker = ForeignKey('Broker', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
+ uptime = BigIntCol(default=None)
@@ -1096,6 +1154,9 @@
SystemConnection = BoolCol(default=None)
federationLink = BoolCol(default=None)
authIdentity = StringCol(length=1000, default=None)
+ remoteProcessName = StringCol(length=1000, default=None)
+ remotePid = BigIntCol(default=None)
+ remoteParentPid = BigIntCol(default=None)
def close(self, model, callback):
@@ -1150,7 +1211,7 @@
model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close",
callback, args=actualArgs)
- def bridge(self, model, callback, durable, src, dest, key, tag, excludes, srcIsQueue,
srcIsLocal, dynamic):
+ def bridge(self, model, callback, durable, src, dest, key, tag, excludes, srcIsQueue,
srcIsLocal, dynamic, sync):
"""Bridge messages over the link"""
actualArgs = list()
if durable is not None:
@@ -1171,6 +1232,8 @@
actualArgs.append(srcIsLocal)
if dynamic is not None:
actualArgs.append(dynamic)
+ if sync is not None:
+ actualArgs.append(sync)
originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "bridge",
callback, args=actualArgs)
@@ -1216,6 +1279,7 @@
tag = StringCol(length=1000, default=None)
excludes = StringCol(length=1000, default=None)
dynamic = BoolCol(default=None)
+ syncRsv = IntCol(default=None)
def close(self, model, callback):
@@ -1259,6 +1323,7 @@
detachedLifespan = BigIntCol(default=None)
attached = BoolCol(default=None)
expireTime = TimestampCol(default=None)
+ maxClientRate = BigIntCol(default=None)
def solicitAck(self, model, callback):
@@ -1297,6 +1362,7 @@
TxnCommits = BigIntCol(default=None)
TxnRejects = BigIntCol(default=None)
TxnCount = BigIntCol(default=None)
+ clientCredit = BigIntCol(default=None)
@@ -1399,6 +1465,11 @@
Master.sqlmeta.addJoin(SQLMultipleJoin('MasterStats',
joinMethodName='stats'))
+classToSchemaNameMap['Grid'] = 'Grid'
+schemaNameToClassMap['Grid'] = Grid
+
+Grid.sqlmeta.addJoin(SQLMultipleJoin('GridStats',
joinMethodName='stats'))
+
classToSchemaNameMap['Acl'] = 'Acl'
schemaNameToClassMap['Acl'] = Acl
@@ -1528,6 +1599,6 @@
Sysimage.sqlmeta.addJoin(SQLMultipleJoin('SysimageStats',
joinMethodName='stats'))
-entityClasses = ['Slot', 'Job', 'Scheduler', 'Submitter',
'Negotiator', 'Collector', 'Master', 'Acl',
'Cluster', 'Store', 'Journal', 'System', 'Broker',
'Agent', 'Vhost', 'Queue', 'Exchange', 'Binding',
'ClientConnection', 'Link', 'Bridge', 'Session',
'Sysimage']
+entityClasses = ['Slot', 'Job', 'Scheduler', 'Submitter',
'Negotiator', 'Collector', 'Master', 'Grid',
'Acl', 'Cluster', 'Store', 'Journal', 'System',
'Broker', 'Agent', 'Vhost', 'Queue', 'Exchange',
'Binding', 'ClientConnection', 'Link', 'Bridge',
'Session', 'Sysimage']
-statsClasses = ['SlotStats', 'JobStats', 'SchedulerStats',
'SubmitterStats', 'NegotiatorStats', 'CollectorStats',
'MasterStats', 'AclStats', 'ClusterStats', 'StoreStats',
'JournalStats', 'SystemStats', 'BrokerStats',
'AgentStats', 'VhostStats', 'QueueStats', 'ExchangeStats',
'BindingStats', 'ClientConnectionStats', 'LinkStats',
'BridgeStats', 'SessionStats', 'SysimageStats']
+statsClasses = ['SlotStats', 'JobStats', 'SchedulerStats',
'SubmitterStats', 'NegotiatorStats', 'CollectorStats',
'MasterStats', 'GridStats', 'AclStats', 'ClusterStats',
'StoreStats', 'JournalStats', 'SystemStats',
'BrokerStats', 'AgentStats', 'VhostStats', 'QueueStats',
'ExchangeStats', 'BindingStats', 'ClientConnectionStats',
'LinkStats', 'BridgeStats', 'SessionStats',
'SysimageStats']
Modified: mgmt/trunk/mint/sql/Makefile
===================================================================
--- mgmt/trunk/mint/sql/Makefile 2009-04-20 18:54:45 UTC (rev 3312)
+++ mgmt/trunk/mint/sql/Makefile 2009-04-20 18:55:47 UTC (rev 3313)
@@ -5,7 +5,7 @@
schema: schema.sql
schema.sql: ../python/mint/*.py
- sqlobject-admin sql -m mint -m mint.schema -c ${dsn} | sed -e '1,2d' >
schema.sql
+ sqlobject-admin sql -m mint.model -m mint.schema -c ${dsn} | sed -e '1,2d' >
schema.sql
clean:
rm -f schema.sql
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2009-04-20 18:54:45 UTC (rev 3312)
+++ mgmt/trunk/mint/sql/schema.sql 2009-04-20 18:55:47 UTC (rev 3313)
@@ -1,8 +1,3 @@
-CREATE TABLE broker_cluster (
- id SERIAL PRIMARY KEY,
- name VARCHAR(1000)
-);
-
CREATE TABLE broker_group (
id SERIAL PRIMARY KEY,
name VARCHAR(1000) NOT NULL UNIQUE
@@ -15,18 +10,11 @@
);
CREATE UNIQUE INDEX broker_group_mapping_unique ON broker_group_mapping (broker_id,
broker_group_id);
-CREATE TABLE broker_profile (
- id SERIAL PRIMARY KEY,
- name VARCHAR(1000)
-);
-
CREATE TABLE broker_registration (
id SERIAL PRIMARY KEY,
name VARCHAR(1000) NOT NULL UNIQUE,
url VARCHAR(1000),
- broker_id INT,
- cluster_id INT,
- profile_id INT
+ broker_id INT
);
CREATE UNIQUE INDEX broker_registration_url_unique ON broker_registration (url);
@@ -167,7 +155,8 @@
src_is_local BOOL,
tag VARCHAR(1000),
excludes VARCHAR(1000),
- dynamic BOOL
+ dynamic BOOL,
+ sync_rsv INT
);
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);
@@ -208,7 +197,8 @@
CREATE TABLE broker_stats (
id SERIAL PRIMARY KEY,
qmf_update_time TIMESTAMP,
- broker_id INT
+ broker_id INT,
+ uptime BIGINT
);
CREATE TABLE client_connection (
@@ -227,7 +217,10 @@
incoming BOOL,
system_connection BOOL,
federation_link BOOL,
- auth_identity VARCHAR(1000)
+ auth_identity VARCHAR(1000),
+ remote_process_name VARCHAR(1000),
+ remote_pid BIGINT,
+ remote_parent_pid BIGINT
);
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);
@@ -258,10 +251,12 @@
broker_id INT,
cluster_name VARCHAR(1000),
cluster_id VARCHAR(1000),
+ member_id VARCHAR(1000),
published_ur_l VARCHAR(1000),
cluster_size INT,
status VARCHAR(1000),
- members VARCHAR(4000)
+ members VARCHAR(4000),
+ member_i_ds VARCHAR(4000)
);
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);
@@ -298,7 +293,13 @@
CREATE TABLE collector_stats (
id SERIAL PRIMARY KEY,
qmf_update_time TIMESTAMP,
- collector_id INT
+ collector_id INT,
+ running_jobs BIGINT,
+ idle_jobs BIGINT,
+ hosts_total BIGINT,
+ hosts_claimed BIGINT,
+ hosts_unclaimed BIGINT,
+ hosts_owner BIGINT
);
CREATE TABLE exchange (
@@ -340,6 +341,42 @@
byte_routes BIGINT
);
+CREATE TABLE grid (
+ id SERIAL PRIMARY KEY,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
+ qmf_class_key VARCHAR(1000),
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
+ stats_curr_id INT,
+ stats_prev_id INT,
+ pool VARCHAR(1000),
+ name VARCHAR(1000),
+ schedd_name VARCHAR(1000),
+ owner VARCHAR(1000),
+ job_limit BIGINT,
+ submit_limit BIGINT,
+ grid_resource_unavailable_time TIMESTAMP
+);
+CREATE UNIQUE INDEX grid_qmfIdsUnique ON grid (qmf_broker_id, qmf_scope_id,
qmf_object_id);
+CREATE INDEX grid_statsCurrIndex ON grid (stats_curr_id);
+CREATE INDEX grid_statsPrevIndex ON grid (stats_prev_id);
+
+CREATE TABLE grid_stats (
+ id SERIAL PRIMARY KEY,
+ qmf_update_time TIMESTAMP,
+ grid_id INT,
+ num_jobs BIGINT,
+ submits_in_progress BIGINT,
+ submits_queued BIGINT,
+ submits_allowed BIGINT,
+ submits_wanted BIGINT,
+ running_jobs BIGINT,
+ idle_jobs BIGINT
+);
+
CREATE TABLE job (
id SERIAL PRIMARY KEY,
qmf_broker_id VARCHAR(1000),
@@ -410,8 +447,10 @@
read_page_size BIGINT,
read_pages BIGINT,
initial_file_count INT,
- data_file_size BIGINT,
- current_file_count BIGINT
+ auto_expand BOOL,
+ current_file_count INT,
+ max_file_count INT,
+ data_file_size BIGINT
);
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);
@@ -426,6 +465,7 @@
record_depth_high BIGINT,
enqueues BIGINT,
dequeues BIGINT,
+ txn BIGINT,
txn_enqueues BIGINT,
txn_dequeues BIGINT,
txn_commits BIGINT,
@@ -676,7 +716,8 @@
client_connection_id INT,
detached_lifespan BIGINT,
attached BOOL,
- expire_time TIMESTAMP
+ expire_time TIMESTAMP,
+ max_client_rate BIGINT
);
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);
@@ -690,7 +731,8 @@
txn_starts BIGINT,
txn_commits BIGINT,
txn_rejects BIGINT,
- txn_count BIGINT
+ txn_count BIGINT,
+ client_credit BIGINT
);
CREATE TABLE slot (
@@ -975,10 +1017,6 @@
ALTER TABLE broker_registration ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id)
REFERENCES broker (id) ON DELETE SET NULL;
-ALTER TABLE broker_registration ADD CONSTRAINT cluster_id_exists FOREIGN KEY (cluster_id)
REFERENCES broker_cluster (id) ON DELETE SET NULL;
-
-ALTER TABLE broker_registration ADD CONSTRAINT profile_id_exists FOREIGN KEY (profile_id)
REFERENCES broker_profile (id) ON DELETE SET NULL;
-
ALTER TABLE subject_role_mapping ADD CONSTRAINT subject_id_exists FOREIGN KEY
(subject_id) REFERENCES subject (id) ON DELETE CASCADE;
ALTER TABLE subject_role_mapping ADD CONSTRAINT role_id_exists FOREIGN KEY (role_id)
REFERENCES role (id) ON DELETE CASCADE;
@@ -1059,6 +1097,12 @@
ALTER TABLE exchange_stats ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id)
REFERENCES exchange (id) ON DELETE SET NULL;
+ALTER TABLE grid ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id)
REFERENCES grid_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE grid ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id)
REFERENCES grid_stats (id) ON DELETE SET NULL;
+
+ALTER TABLE grid_stats ADD CONSTRAINT grid_id_exists FOREIGN KEY (grid_id) REFERENCES
grid (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;
Modified: mgmt/trunk/mint/sql/triggers.sql
===================================================================
--- mgmt/trunk/mint/sql/triggers.sql 2009-04-20 18:54:45 UTC (rev 3312)
+++ mgmt/trunk/mint/sql/triggers.sql 2009-04-20 18:55:47 UTC (rev 3313)
@@ -108,6 +108,19 @@
CREATE INDEX master_stats_update_time ON master_stats (qmf_update_time);
+CREATE OR REPLACE FUNCTION update_grid_stats() RETURNS trigger AS '
+BEGIN
+ UPDATE grid SET stats_prev_id = stats_curr_id, stats_curr_id = new.id WHERE id =
new.grid_id;
+ RETURN new;
+END
+' LANGUAGE plpgsql;
+
+CREATE TRIGGER update_grid_stats AFTER INSERT ON grid_stats
+ FOR EACH ROW EXECUTE PROCEDURE update_grid_stats();
+
+CREATE INDEX grid_stats_update_time ON grid_stats (qmf_update_time);
+
+
CREATE OR REPLACE FUNCTION update_acl_stats() RETURNS trigger AS '
BEGIN
UPDATE acl SET stats_prev_id = stats_curr_id, stats_curr_id = new.id WHERE id =
new.acl_id;