1:23 p.m.
Author: nunofsantos
Date: 2008-09-22 14:23:23 -0400 (Mon, 22 Sep 2008)
New Revision: 2523
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
temporary handling of namespace info in references; store absTime type values in a
TimestampCol
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-09-22 18:23:12 UTC (rev 2522)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-09-22 18:23:23 UTC (rev 2523)
@@ -512,7 +512,7 @@
session = ForeignKey('Session', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
attached = BoolCol(default=None)
- expireTime = BigIntCol(default=None)
+ expireTime = TimestampCol(default=None)
framesOutstanding = IntCol(default=None)
@@ -535,7 +535,7 @@
policyFile = StringCol(length=1000, default=None)
enforcingAcl = BoolCol(default=None)
transferAcl = BoolCol(default=None)
- lastAclLoad = BigIntCol(default=None)
+ lastAclLoad = TimestampCol(default=None)
def reloadACLFile(self, model, callback):
@@ -746,6 +746,7 @@
Arch = StringCol(length=1000, default=None)
CheckpointPlatform = StringCol(length=1000, default=None)
ClientMachine = StringCol(length=1000, default=None)
+ ConcurrencyLimits = StringCol(length=1000, default=None)
Cpus = IntCol(default=None)
CurrentRank = FloatCol(default=None)
Disk = IntCol(default=None)
@@ -754,7 +755,7 @@
ImageSize = IntCol(default=None)
IsValidCheckpointPlatform = StringCol(length=4000, default=None)
JobId = StringCol(length=1000, default=None)
- JobStart = BigIntCol(default=None)
+ JobStart = TimestampCol(default=None)
KFlops = IntCol(default=None)
Machine = StringCol(length=1000, default=None)
MaxJobRetirementTime = StringCol(length=4000, default=None)
@@ -763,6 +764,7 @@
MyAddress = StringCol(length=1000, default=None)
Name = StringCol(length=1000, default=None)
OpSys = StringCol(length=1000, default=None)
+ PreemptingConcurrencyLimits = StringCol(length=1000, default=None)
PreemptingOwner = StringCol(length=1000, default=None)
PreemptingUser = StringCol(length=1000, default=None)
PreemptingRank = FloatCol(default=None)
@@ -791,7 +793,7 @@
CondorPlatform = StringCol(length=1000, default=None)
CondorVersion = StringCol(length=1000, default=None)
- DaemonStartTime = BigIntCol(default=None)
+ DaemonStartTime = TimestampCol(default=None)
class SlotStats(SQLObject):
@@ -806,16 +808,16 @@
ClockMin = IntCol(default=None)
CondorLoadAvg = FloatCol(default=None)
ConsoleIdle = IntCol(default=None)
- EnteredCurrentActivity = BigIntCol(default=None)
- EnteredCurrentState = BigIntCol(default=None)
+ EnteredCurrentActivity = TimestampCol(default=None)
+ EnteredCurrentState = TimestampCol(default=None)
KeyboardIdle = IntCol(default=None)
- LastBenchmark = BigIntCol(default=None)
- LastFetchWorkCompleted = BigIntCol(default=None)
- LastFetchWorkSpawned = BigIntCol(default=None)
- LastPeriodicCheckpoint = BigIntCol(default=None)
+ LastBenchmark = TimestampCol(default=None)
+ LastFetchWorkCompleted = TimestampCol(default=None)
+ LastFetchWorkSpawned = TimestampCol(default=None)
+ LastPeriodicCheckpoint = TimestampCol(default=None)
LoadAvg = FloatCol(default=None)
- MyCurrentTime = BigIntCol(default=None)
- NextFetchWorkDelay = BigIntCol(default=None)
+ MyCurrentTime = TimestampCol(default=None)
+ NextFetchWorkDelay = TimestampCol(default=None)
State = StringCol(length=1000, default=None)
TimeToLive = IntCol(default=None)
TotalCondorLoadAvg = FloatCol(default=None)
@@ -839,7 +841,7 @@
MonitorSelfImageSize = FloatCol(default=None)
MonitorSelfRegisteredSocketCount = IntCol(default=None)
MonitorSelfResidentSetSize = IntCol(default=None)
- MonitorSelfTime = BigIntCol(default=None)
+ MonitorSelfTime = TimestampCol(default=None)
@@ -875,7 +877,7 @@
Out = StringCol(length=4000, default=None)
Owner = StringCol(length=1000, default=None)
ProcId = IntCol(default=None)
- QDate = BigIntCol(default=None)
+ QDate = TimestampCol(default=None)
Requirements = StringCol(length=4000, default=None)
Title = StringCol(length=1000, default=None)
UserLog = StringCol(length=4000, default=None)
@@ -964,7 +966,7 @@
statsCurr = ForeignKey('SchedulerStats', cascade='null', default=None)
statsPrev = ForeignKey('SchedulerStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- JobQueueBirthdate = BigIntCol(default=None)
+ JobQueueBirthdate = TimestampCol(default=None)
MaxJobsRunning = IntCol(default=None)
Machine = StringCol(length=1000, default=None)
MyAddress = StringCol(length=1000, default=None)
@@ -973,7 +975,7 @@
CondorPlatform = StringCol(length=1000, default=None)
CondorVersion = StringCol(length=1000, default=None)
- DaemonStartTime = BigIntCol(default=None)
+ DaemonStartTime = TimestampCol(default=None)
class SchedulerStats(SQLObject):
@@ -995,7 +997,7 @@
MonitorSelfImageSize = FloatCol(default=None)
MonitorSelfRegisteredSocketCount = IntCol(default=None)
MonitorSelfResidentSetSize = IntCol(default=None)
- MonitorSelfTime = BigIntCol(default=None)
+ MonitorSelfTime = TimestampCol(default=None)
@@ -1163,8 +1165,8 @@
Journal.sqlmeta.addJoin(SQLMultipleJoin('JournalStats',
joinMethodName='stats'))
-classToSchemaNameMap['Slot'] = 'slot'
-schemaNameToClassMap['slot'] = Slot
+classToSchemaNameMap['Slot'] = 'Slot'
+schemaNameToClassMap['Slot'] = Slot
Slot.sqlmeta.addJoin(SQLMultipleJoin('SlotStats',
joinMethodName='stats'))
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-09-22 18:23:12 UTC (rev 2522)
+++ mgmt/trunk/mint/sql/schema.sql 2008-09-22 18:23:23 UTC (rev 2523)
@@ -84,7 +84,7 @@
policy_file VARCHAR(1000),
enforcing_acl BOOL,
transfer_acl BOOL,
- last_acl_load BIGINT
+ last_acl_load TIMESTAMP
);
CREATE TABLE acl_stats (
@@ -311,7 +311,7 @@
out VARCHAR(4000),
owner VARCHAR(1000),
proc_id INT,
- q_date BIGINT,
+ q_date TIMESTAMP,
requirements VARCHAR(4000),
title VARCHAR(1000),
user_log VARCHAR(4000),
@@ -475,7 +475,7 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
- job_queue_birthdate BIGINT,
+ job_queue_birthdate TIMESTAMP,
max_jobs_running INT,
machine VARCHAR(1000),
my_address VARCHAR(1000),
@@ -483,7 +483,7 @@
public_network_ip_addr VARCHAR(1000),
condor_platform VARCHAR(1000),
condor_version VARCHAR(1000),
- daemon_start_time BIGINT
+ daemon_start_time TIMESTAMP
);
CREATE TABLE scheduler_stats (
@@ -501,7 +501,7 @@
monitor_self_image_size FLOAT,
monitor_self_registered_socket_count INT,
monitor_self_resident_set_size INT,
- monitor_self_time BIGINT
+ monitor_self_time TIMESTAMP
);
CREATE TABLE session (
@@ -526,7 +526,7 @@
rec_time TIMESTAMP,
session_id INT,
attached BOOL,
- expire_time BIGINT,
+ expire_time TIMESTAMP,
frames_outstanding INT
);
@@ -544,6 +544,7 @@
arch VARCHAR(1000),
checkpoint_platform VARCHAR(1000),
client_machine VARCHAR(1000),
+ concurrency_limits VARCHAR(1000),
cpus INT,
current_rank FLOAT,
disk INT,
@@ -552,7 +553,7 @@
image_size INT,
is_valid_checkpoint_platform VARCHAR(4000),
job_id VARCHAR(1000),
- job_start BIGINT,
+ job_start TIMESTAMP,
k_flops INT,
machine VARCHAR(1000),
max_job_retirement_time VARCHAR(4000),
@@ -561,6 +562,7 @@
my_address VARCHAR(1000),
name VARCHAR(1000),
op_sys VARCHAR(1000),
+ preempting_concurrency_limits VARCHAR(1000),
preempting_owner VARCHAR(1000),
preempting_user VARCHAR(1000),
preempting_rank FLOAT,
@@ -588,7 +590,7 @@
windows_minor_version INT,
condor_platform VARCHAR(1000),
condor_version VARCHAR(1000),
- daemon_start_time BIGINT
+ daemon_start_time TIMESTAMP
);
CREATE TABLE slot_stats (
@@ -600,16 +602,16 @@
clock_min INT,
condor_load_avg FLOAT,
console_idle INT,
- entered_current_activity BIGINT,
- entered_current_state BIGINT,
+ entered_current_activity TIMESTAMP,
+ entered_current_state TIMESTAMP,
keyboard_idle INT,
- last_benchmark BIGINT,
- last_fetch_work_completed BIGINT,
- last_fetch_work_spawned BIGINT,
- last_periodic_checkpoint BIGINT,
+ last_benchmark TIMESTAMP,
+ last_fetch_work_completed TIMESTAMP,
+ last_fetch_work_spawned TIMESTAMP,
+ last_periodic_checkpoint TIMESTAMP,
load_avg FLOAT,
- my_current_time BIGINT,
- next_fetch_work_delay BIGINT,
+ my_current_time TIMESTAMP,
+ next_fetch_work_delay TIMESTAMP,
state VARCHAR(1000),
time_to_live INT,
total_condor_load_avg FLOAT,
@@ -632,7 +634,7 @@
monitor_self_image_size FLOAT,
monitor_self_registered_socket_count INT,
monitor_self_resident_set_size INT,
- monitor_self_time BIGINT
+ monitor_self_time TIMESTAMP
);
CREATE TABLE store (