rhmessaging commits: r3834 - mgmt/trunk/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-01-29 17:35:19 -0500 (Fri, 29 Jan 2010)
New Revision: 3834
Modified:
mgmt/trunk/cumin/python/cumin/grid/limit.py
Log:
There are no limits to list if there is no negotiator
Modified: mgmt/trunk/cumin/python/cumin/grid/limit.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/limit.py 2010-01-29 22:04:51 UTC (rev 3833)
+++ mgmt/trunk/cumin/python/cumin/grid/limit.py 2010-01-29 22:35:19 UTC (rev 3834)
@@ -24,6 +24,9 @@
def get_items(self, session):
negotiator = self.negotiator.get(session)
+ if not negotiator:
+ return
+
limits = self.app.model.get_negotiator_limits(negotiator)
if limits is None:
14 years, 10 months
rhmessaging commits: r3833 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-01-29 17:04:51 -0500 (Fri, 29 Jan 2010)
New Revision: 3833
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Some asserts to help track down an occasional nonetype error
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2010-01-29 21:31:46 UTC (rev 3832)
+++ mgmt/trunk/cumin/python/cumin/model.py 2010-01-29 22:04:51 UTC (rev 3833)
@@ -129,6 +129,8 @@
return agent.agent.getBroker().getAmqpSession()
def get_negotiator_limits(self, negotiator):
+ assert negotiator
+
self.lock.acquire()
try:
@@ -147,6 +149,8 @@
self.lock.release()
def get_submission_jobs(self, submission):
+ assert submission
+
self.lock.acquire()
try:
14 years, 10 months
rhmessaging commits: r3832 - in mgmt/trunk: wooly/python/wooly and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-01-29 16:31:46 -0500 (Fri, 29 Jan 2010)
New Revision: 3832
Modified:
mgmt/trunk/cumin/python/cumin/tools.py
mgmt/trunk/wooly/python/wooly/server.py
Log:
Check that the web port is bindable before starting the server
Modified: mgmt/trunk/cumin/python/cumin/tools.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/tools.py 2010-01-29 14:43:06 UTC (rev 3831)
+++ mgmt/trunk/cumin/python/cumin/tools.py 2010-01-29 21:31:46 UTC (rev 3832)
@@ -125,6 +125,7 @@
app.init()
server = CuminServer(app, self.config.addr, self.config.port)
+ server.init()
if self.config.ssl:
cpath = os.path.join(self.config.home, "etc", "cumin.crt")
Modified: mgmt/trunk/wooly/python/wooly/server.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/server.py 2010-01-29 14:43:06 UTC (rev 3831)
+++ mgmt/trunk/wooly/python/wooly/server.py 2010-01-29 21:31:46 UTC (rev 3832)
@@ -1,3 +1,5 @@
+import socket
+
from traceback import print_exc
from datetime import datetime, timedelta
from threading import Thread
@@ -35,6 +37,23 @@
def set_ssl_key_path(self, path):
self.server.ssl_private_key = path
+ def do_init(self):
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
+ try:
+ for i in range(10):
+ try:
+ s.bind((self.addr, self.port))
+ return
+ except socket.error:
+ log.warn("Address %s:%i is taken; retrying",
+ self.addr, self.port)
+ time.sleep(1)
+ finally:
+ s.close()
+
+ raise Exception("Failed to bind to %s:%i" % (self.addr, self.port))
+
def do_start(self):
self.server.start()
self.client_session_expire_thread.start()
14 years, 10 months
rhmessaging commits: r3831 - mgmt/trunk/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-01-29 09:43:06 -0500 (Fri, 29 Jan 2010)
New Revision: 3831
Modified:
mgmt/trunk/cumin/python/cumin/grid/model.py
mgmt/trunk/cumin/python/cumin/grid/submission.py
Log:
Fix string handling for submissions
Modified: mgmt/trunk/cumin/python/cumin/grid/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/model.py 2010-01-28 21:25:27 UTC (rev 3830)
+++ mgmt/trunk/cumin/python/cumin/grid/model.py 2010-01-29 14:43:06 UTC (rev 3831)
@@ -80,7 +80,8 @@
scheduler.Submit(completion, ad, None)
def condor_string(string):
- return "\"%s\"" % string
+ return string
+ # XXX return "\"%s\"" % string
class NegotiatorStartTask(QmfTask):
def __init__(self, app, cls):
Modified: mgmt/trunk/cumin/python/cumin/grid/submission.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/submission.py 2010-01-28 21:25:27 UTC (rev 3830)
+++ mgmt/trunk/cumin/python/cumin/grid/submission.py 2010-01-29 14:43:06 UTC (rev 3831)
@@ -189,7 +189,7 @@
tokens = shlex.split(command)
executable = tokens[0]
- args = tokens[1:]
+ args = " ".join(tokens[1:])
if not requirements:
requirements = "TRUE"
14 years, 10 months
rhmessaging commits: r3830 - in mgmt/trunk: mint/python/mint and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-01-28 16:25:27 -0500 (Thu, 28 Jan 2010)
New Revision: 3830
Modified:
mgmt/trunk/cumin/python/cumin/tools.py
mgmt/trunk/mint/python/mint/tools.py
Log:
Don't use __file__ as the source for privilege hecks; it won't have the owner we want
Modified: mgmt/trunk/cumin/python/cumin/tools.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/tools.py 2010-01-28 19:04:36 UTC (rev 3829)
+++ mgmt/trunk/cumin/python/cumin/tools.py 2010-01-28 21:25:27 UTC (rev 3830)
@@ -40,7 +40,7 @@
opt.description = "Enable debugging; print logging to console"
def check(self):
- if os.getuid() not in (os.stat(__file__).st_uid, 0):
+ if os.getuid() not in (os.stat(sys.argv[0]).st_uid, 0):
print "Error: You have insufficient privileges"
sys.exit(1)
@@ -50,7 +50,7 @@
# Drop privileges
if os.getuid() == 0:
- os.setuid(os.stat(__file__).st_uid)
+ os.setuid(os.stat(sys.argv[0]).st_uid)
try:
import psyco
Modified: mgmt/trunk/mint/python/mint/tools.py
===================================================================
--- mgmt/trunk/mint/python/mint/tools.py 2010-01-28 19:04:36 UTC (rev 3829)
+++ mgmt/trunk/mint/python/mint/tools.py 2010-01-28 21:25:27 UTC (rev 3830)
@@ -36,7 +36,7 @@
opt.description = "Enable debugging; print logging to console"
def check(self):
- if os.getuid() not in (os.stat(__file__).st_uid, 0):
+ if os.getuid() not in (os.stat(sys.argv[0]).st_uid, 0):
print "Error: You have insufficient privileges"
sys.exit(1)
@@ -46,7 +46,7 @@
# Drop privileges
if os.getuid() == 0:
- os.setuid(os.stat(__file__).st_uid)
+ os.setuid(os.stat(sys.argv[0]).st_uid)
try:
import psyco
14 years, 11 months
rhmessaging commits: r3829 - mgmt/trunk/mint/sql.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-01-28 14:04:36 -0500 (Thu, 28 Jan 2010)
New Revision: 3829
Modified:
mgmt/trunk/mint/sql/schema.sql
Log:
Regenerated to reflect changes to slot and slot.stats
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2010-01-28 19:03:59 UTC (rev 3828)
+++ mgmt/trunk/mint/sql/schema.sql 2010-01-28 19:04:36 UTC (rev 3829)
@@ -231,7 +231,7 @@
condor_platform TEXT,
condor_version TEXT,
name TEXT,
- public_network_ip_addr TEXT
+ my_address TEXT
);
CREATE UNIQUE INDEX collector_qmfIdsUnique ON collector (qmf_agent_id, qmf_object_id);
CREATE INDEX collector_statsPrevIndex ON collector (stats_prev_id);
@@ -434,7 +434,6 @@
system TEXT,
name TEXT,
machine TEXT,
- public_network_ip_addr TEXT,
my_address TEXT,
real_uid INT,
condor_platform TEXT,
@@ -442,8 +441,8 @@
daemon_start_time TIMESTAMP
);
CREATE UNIQUE INDEX master_qmfIdsUnique ON master (qmf_agent_id, qmf_object_id);
-CREATE INDEX master_statsCurrIndex ON master (stats_curr_id);
CREATE INDEX master_statsPrevIndex ON master (stats_prev_id);
+CREATE INDEX master_statsCurrIndex ON master (stats_curr_id);
CREATE TABLE master_stats (
id SERIAL PRIMARY KEY,
@@ -567,7 +566,6 @@
machine TEXT,
my_address TEXT,
name TEXT,
- public_network_ip_addr TEXT,
condor_platform TEXT,
condor_version TEXT,
daemon_start_time TIMESTAMP
@@ -644,6 +642,7 @@
pool TEXT,
system TEXT,
accounting_group TEXT,
+ activity TEXT,
arch TEXT,
checkpoint_platform TEXT,
client_machine TEXT,
@@ -651,18 +650,25 @@
cpus BIGINT,
current_rank FLOAT,
disk BIGINT,
+ entered_current_activity TIMESTAMP,
+ entered_current_state TIMESTAMP,
file_system_domain TEXT,
global_job_id TEXT,
is_valid_checkpoint_platform TEXT,
job_id TEXT,
job_start TIMESTAMP,
k_flops BIGINT,
+ last_benchmark TIMESTAMP,
+ last_fetch_work_completed TIMESTAMP,
+ last_fetch_work_spawned TIMESTAMP,
+ last_periodic_checkpoint TIMESTAMP,
machine TEXT,
max_job_retirement_time TEXT,
memory BIGINT,
mips BIGINT,
my_address TEXT,
name TEXT,
+ next_fetch_work_delay INT,
op_sys TEXT,
preempting_concurrency_limits TEXT,
preempting_owner TEXT,
@@ -671,11 +677,12 @@
remote_owner TEXT,
remote_user TEXT,
requirements TEXT,
- public_network_ip_addr TEXT,
rank TEXT,
slot_id BIGINT,
start TEXT,
starter_ability_list TEXT,
+ state TEXT,
+ time_to_live BIGINT,
total_claim_run_time BIGINT,
total_claim_suspend_time BIGINT,
total_cpus BIGINT,
@@ -702,24 +709,14 @@
id SERIAL PRIMARY KEY,
qmf_update_time TIMESTAMP NOT NULL,
slot_id INT,
- activity TEXT,
clock_day BIGINT,
clock_min BIGINT,
condor_load_avg FLOAT,
console_idle BIGINT,
- entered_current_activity TIMESTAMP,
- entered_current_state TIMESTAMP,
image_size BIGINT,
keyboard_idle BIGINT,
- last_benchmark TIMESTAMP,
- last_fetch_work_completed TIMESTAMP,
- last_fetch_work_spawned TIMESTAMP,
- last_periodic_checkpoint TIMESTAMP,
load_avg FLOAT,
my_current_time TIMESTAMP,
- next_fetch_work_delay INT,
- state TEXT,
- time_to_live BIGINT,
total_condor_load_avg FLOAT,
total_load_avg FLOAT,
total_time_backfill_busy BIGINT,
14 years, 11 months
rhmessaging commits: r3828 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-01-28 14:03:59 -0500 (Thu, 28 Jan 2010)
New Revision: 3828
Modified:
mgmt/trunk/mint/python/mint/schema.py
Log:
Regenerated to reflect changes to slot and slot.stats
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2010-01-27 19:12:55 UTC (rev 3827)
+++ mgmt/trunk/mint/python/mint/schema.py 2010-01-28 19:03:59 UTC (rev 3828)
@@ -22,6 +22,7 @@
Pool = StringCol(default=None)
System = StringCol(default=None)
AccountingGroup = StringCol(default=None)
+ Activity = StringCol(default=None)
Arch = StringCol(default=None)
CheckpointPlatform = StringCol(default=None)
ClientMachine = StringCol(default=None)
@@ -29,18 +30,25 @@
Cpus = BigIntCol(default=None)
CurrentRank = FloatCol(default=None)
Disk = BigIntCol(default=None)
+ EnteredCurrentActivity = TimestampCol(default=None)
+ EnteredCurrentState = TimestampCol(default=None)
FileSystemDomain = StringCol(default=None)
GlobalJobId = StringCol(default=None)
IsValidCheckpointPlatform = StringCol(default=None)
JobId = StringCol(default=None)
JobStart = TimestampCol(default=None)
KFlops = BigIntCol(default=None)
+ LastBenchmark = TimestampCol(default=None)
+ LastFetchWorkCompleted = TimestampCol(default=None)
+ LastFetchWorkSpawned = TimestampCol(default=None)
+ LastPeriodicCheckpoint = TimestampCol(default=None)
Machine = StringCol(default=None)
MaxJobRetirementTime = StringCol(default=None)
Memory = BigIntCol(default=None)
Mips = BigIntCol(default=None)
MyAddress = StringCol(default=None)
Name = StringCol(default=None)
+ NextFetchWorkDelay = IntCol(default=None)
OpSys = StringCol(default=None)
PreemptingConcurrencyLimits = StringCol(default=None)
PreemptingOwner = StringCol(default=None)
@@ -49,11 +57,12 @@
RemoteOwner = StringCol(default=None)
RemoteUser = StringCol(default=None)
Requirements = StringCol(default=None)
- PublicNetworkIpAddr = StringCol(default=None)
Rank = StringCol(default=None)
SlotID = BigIntCol(default=None)
Start = StringCol(default=None)
StarterAbilityList = StringCol(default=None)
+ State = StringCol(default=None)
+ TimeToLive = BigIntCol(default=None)
TotalClaimRunTime = BigIntCol(default=None)
TotalClaimSuspendTime = BigIntCol(default=None)
TotalCpus = BigIntCol(default=None)
@@ -79,24 +88,14 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(notNone=True, default=None)
slot = ForeignKey('Slot', cascade='null', default=None)
- Activity = StringCol(default=None)
ClockDay = BigIntCol(default=None)
ClockMin = BigIntCol(default=None)
CondorLoadAvg = FloatCol(default=None)
ConsoleIdle = BigIntCol(default=None)
- EnteredCurrentActivity = TimestampCol(default=None)
- EnteredCurrentState = TimestampCol(default=None)
ImageSize = BigIntCol(default=None)
KeyboardIdle = BigIntCol(default=None)
- LastBenchmark = TimestampCol(default=None)
- LastFetchWorkCompleted = TimestampCol(default=None)
- LastFetchWorkSpawned = TimestampCol(default=None)
- LastPeriodicCheckpoint = TimestampCol(default=None)
LoadAvg = FloatCol(default=None)
MyCurrentTime = TimestampCol(default=None)
- NextFetchWorkDelay = IntCol(default=None)
- State = StringCol(default=None)
- TimeToLive = BigIntCol(default=None)
TotalCondorLoadAvg = FloatCol(default=None)
TotalLoadAvg = FloatCol(default=None)
TotalTimeBackfillBusy = BigIntCol(default=None)
@@ -145,7 +144,6 @@
Machine = StringCol(default=None)
MyAddress = StringCol(default=None)
Name = StringCol(default=None)
- PublicNetworkIpAddr = StringCol(default=None)
CondorPlatform = StringCol(default=None)
CondorVersion = StringCol(default=None)
@@ -559,7 +557,7 @@
CondorPlatform = StringCol(default=None)
CondorVersion = StringCol(default=None)
Name = StringCol(default=None)
- PublicNetworkIpAddr = StringCol(default=None)
+ MyAddress = StringCol(default=None)
class CollectorStats(SQLObject):
@@ -596,7 +594,6 @@
System = StringCol(default=None)
Name = StringCol(default=None)
Machine = StringCol(default=None)
- PublicNetworkIpAddr = StringCol(default=None)
MyAddress = StringCol(default=None)
RealUid = IntCol(default=None)
14 years, 11 months
rhmessaging commits: r3827 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-01-27 14:12:55 -0500 (Wed, 27 Jan 2010)
New Revision: 3827
Modified:
mgmt/trunk/cumin/python/cumin/stat.py
Log:
Don't send unicode string to json converter.
Modified: mgmt/trunk/cumin/python/cumin/stat.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.py 2010-01-27 16:43:23 UTC (rev 3826)
+++ mgmt/trunk/cumin/python/cumin/stat.py 2010-01-27 19:12:55 UTC (rev 3827)
@@ -961,7 +961,10 @@
halo_size = 1
chart = Chart()
- chart.id = self.page.chart_id.get(session);
+ id = self.page.chart_id.get(session)
+ if isinstance(id, unicode):
+ id = id.encode('ascii', 'replace')
+ chart.id = id
chart.bg_colour = "#FFFFFF"
self.make_chart_lines(session, chart, "area", stats, dot_size, halo_size, line_width, samples, duration, end_secs, mode)
14 years, 11 months
rhmessaging commits: r3826 - mgmt/trunk/sesame/cpp.
by rhmessaging-commits＠lists.jboss.org
Author: tedross
Date: 2010-01-27 11:43:23 -0500 (Wed, 27 Jan 2010)
New Revision: 3826
Modified:
mgmt/trunk/sesame/cpp/configure.ac
Log:
Fixed a problem with the QMF library name.
Modified: mgmt/trunk/sesame/cpp/configure.ac
===================================================================
--- mgmt/trunk/sesame/cpp/configure.ac 2010-01-27 15:59:47 UTC (rev 3825)
+++ mgmt/trunk/sesame/cpp/configure.ac 2010-01-27 16:43:23 UTC (rev 3826)
@@ -103,7 +103,7 @@
# Give any/all diagnostics before failing.
test $fail = 1 &&
AC_MSG_ERROR([Missing required qpid libraries/headers. Install package qmf-devel or use --with-qpid-checkout])
- QPID_LIBS="-lqmfagent"
+ QPID_LIBS="-lqmf"
QPID_CXXFLAGS="-I$includedir/qpid-boost"
fi
14 years, 11 months
rhmessaging commits: r3825 - mgmt/trunk/parsley/python/parsley.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-01-27 10:59:47 -0500 (Wed, 27 Jan 2010)
New Revision: 3825
Modified:
mgmt/trunk/parsley/python/parsley/command.py
Log:
Use the right super call
Modified: mgmt/trunk/parsley/python/parsley/command.py
===================================================================
--- mgmt/trunk/parsley/python/parsley/command.py 2010-01-27 15:52:45 UTC (rev 3824)
+++ mgmt/trunk/parsley/python/parsley/command.py 2010-01-27 15:59:47 UTC (rev 3825)
@@ -159,6 +159,6 @@
class CommandException(Exception):
def __init__(self, command, message):
- super(CommandException, self).__init__(message)
+ Exception.__init__(self, message)
self.command = command
14 years, 11 months