[rhmessaging-commits] rhmessaging commits: r2363 - in mgmt/trunk/mint: sql and 1 other directory.

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,