rhmessaging commits: r4236 - mgmt/newdata/cumin/etc.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-08-26 17:49:00 -0400 (Thu, 26 Aug 2010)
New Revision: 4236
Modified:
mgmt/newdata/cumin/etc/cumin.conf
Log:
Document the packages param in config file
Modified: mgmt/newdata/cumin/etc/cumin.conf
===================================================================
--- mgmt/newdata/cumin/etc/cumin.conf 2010-08-26 21:41:26 UTC (rev 4235)
+++ mgmt/newdata/cumin/etc/cumin.conf 2010-08-26 21:49:00 UTC (rev 4236)
@@ -16,3 +16,4 @@
# log-file: $CUMIN_HOME/log/data.log
# expire-interval: 600
# expire-threshold: 86400
+# packages: [all]
13 years, 10 months
rhmessaging commits: r4235 - in mgmt/newdata/cumin: resources and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-08-26 17:41:26 -0400 (Thu, 26 Aug 2010)
New Revision: 4235
Modified:
mgmt/newdata/cumin/python/cumin/grid/slot.py
mgmt/newdata/cumin/resources/slots.swf
Log:
Fix for BZ 623677
- Disable the slot vis animations
- Fix the drilled down slot sort order to Activity+State, Name
Modified: mgmt/newdata/cumin/python/cumin/grid/slot.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/slot.py 2010-08-26 21:34:22 UTC (rev 4234)
+++ mgmt/newdata/cumin/python/cumin/grid/slot.py 2010-08-26 21:41:26 UTC (rev 4235)
@@ -270,9 +270,8 @@
# leaf
if level == len(groups):
if leaves:
- #for i in sorted(plist, key=lambda x:"%s%s%s" %
- # (records[x]["Activity"], records[x]["State"], records[x]["Name"])):
- for i in sorted(plist, key=lambda x: records[x]["Name"]):
+ for i in sorted(plist, key=lambda x:"%s%s%s" %
+ (records[x]["Activity"], records[x]["State"], records[x]["Name"])):
el = Element()
el.job_id = records[i]["JobId"] and records[i]["JobId"] or ""
el.activity = records[i]["Activity"] and records[i]["Activity"] or "Unknown"
@@ -287,7 +286,7 @@
if not expanded:
# display summary info for all the slots under this grouping
activityStates = self.get_activityStates(records, plist)
- for activityState in activityStates:
+ for activityState in sorted(activityStates):
el = Element()
el.name = "slot_info"
el.a_s = activityState
Modified: mgmt/newdata/cumin/resources/slots.swf
===================================================================
(Binary files differ)
13 years, 10 months
rhmessaging commits: r4234 - in mgmt/newdata: cumin/python/cumin and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-08-26 17:34:22 -0400 (Thu, 26 Aug 2010)
New Revision: 4234
Modified:
mgmt/newdata/cumin/etc/cumin.conf
mgmt/newdata/cumin/python/cumin/config.py
mgmt/newdata/mint/python/mint/expire.py
mgmt/newdata/mint/python/mint/main.py
Log:
Rename expire frequency to interval; it's a better name and it matches the new parameter that Ernie introduced for the web update interval
Modified: mgmt/newdata/cumin/etc/cumin.conf
===================================================================
--- mgmt/newdata/cumin/etc/cumin.conf 2010-08-26 21:10:31 UTC (rev 4233)
+++ mgmt/newdata/cumin/etc/cumin.conf 2010-08-26 21:34:22 UTC (rev 4234)
@@ -14,5 +14,5 @@
[data]
# log-file: $CUMIN_HOME/log/data.log
-# expire-frequency: 600
+# expire-interval: 600
# expire-threshold: 86400
Modified: mgmt/newdata/cumin/python/cumin/config.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/config.py 2010-08-26 21:10:31 UTC (rev 4233)
+++ mgmt/newdata/cumin/python/cumin/config.py 2010-08-26 21:34:22 UTC (rev 4234)
@@ -38,7 +38,7 @@
param = ConfigParameter(data, "packages", str)
- param = ConfigParameter(data, "expire-frequency", int)
+ param = ConfigParameter(data, "expire-interval", int)
param.default = 600 # 10 minutes
param = ConfigParameter(data, "expire-threshold", int)
Modified: mgmt/newdata/mint/python/mint/expire.py
===================================================================
--- mgmt/newdata/mint/python/mint/expire.py 2010-08-26 21:10:31 UTC (rev 4233)
+++ mgmt/newdata/mint/python/mint/expire.py 2010-08-26 21:34:22 UTC (rev 4234)
@@ -9,19 +9,19 @@
def init(self):
log.debug("Initializing %s", self)
- frequency = self.app.expire_frequency
+ interval = self.app.expire_interval
threshold = self.app.expire_threshold
- frequency_out, frequency_unit = convert_time_units(frequency)
+ interval_out, interval_unit = convert_time_units(interval)
threshold_out, threshold_unit = convert_time_units(threshold)
- args = (threshold_out, threshold_unit, frequency_out, frequency_unit)
+ args = (threshold_out, threshold_unit, interval_out, interval_unit)
log.debug("Expiring database records older than %d %s, every %d %s" \
% args)
def run(self):
- frequency = self.app.expire_frequency
+ interval = self.app.expire_interval
while True:
if self.stop_requested:
@@ -30,7 +30,7 @@
up = ExpireUpdate(self.app.model)
self.app.update_thread.enqueue(up)
- sleep(frequency)
+ sleep(interval)
class ExpireUpdate(Update):
def do_process(self, cursor, stats):
Modified: mgmt/newdata/mint/python/mint/main.py
===================================================================
--- mgmt/newdata/mint/python/mint/main.py 2010-08-26 21:10:31 UTC (rev 4233)
+++ mgmt/newdata/mint/python/mint/main.py 2010-08-26 21:34:22 UTC (rev 4234)
@@ -21,7 +21,7 @@
self.update_thread = UpdateThread(self)
self.expire_enabled = True
- self.expire_frequency = 600
+ self.expire_interval = 600
self.expire_threshold = 24 * 3600
self.expire_thread = ExpireThread(self)
13 years, 10 months
rhmessaging commits: r4233 - store/trunk/cpp/lib.
by rhmessaging-commits＠lists.jboss.org
Author: aconway
Date: 2010-08-26 17:10:31 -0400 (Thu, 26 Aug 2010)
New Revision: 4233
Modified:
store/trunk/cpp/lib/JournalImpl.h
Log:
Name timers for logging purposes.
Modified: store/trunk/cpp/lib/JournalImpl.h
===================================================================
--- store/trunk/cpp/lib/JournalImpl.h 2010-08-26 21:07:48 UTC (rev 4232)
+++ store/trunk/cpp/lib/JournalImpl.h 2010-08-26 21:10:31 UTC (rev 4233)
@@ -53,7 +53,7 @@
public:
InactivityFireEvent(JournalImpl* p, const qpid::sys::Duration timeout):
- qpid::sys::TimerTask(timeout), _parent(p) {}
+ qpid::sys::TimerTask(timeout,"JournalInactive"), _parent(p) {}
virtual ~InactivityFireEvent() {}
void fire();
inline void cancel() { qpid::sys::Mutex::ScopedLock sl(_ife_lock); _parent = 0; }
@@ -66,7 +66,7 @@
public:
GetEventsFireEvent(JournalImpl* p, const qpid::sys::Duration timeout):
- qpid::sys::TimerTask(timeout), _parent(p) {}
+ qpid::sys::TimerTask(timeout,"JournalGetEvents"), _parent(p) {}
virtual ~GetEventsFireEvent() {}
void fire();
inline void cancel() { qpid::sys::Mutex::ScopedLock sl(_gefe_lock); _parent = 0; }
13 years, 10 months
rhmessaging commits: r4232 - in mgmt/newdata: wooly/python/wooly and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-08-26 17:07:48 -0400 (Thu, 26 Aug 2010)
New Revision: 4232
Modified:
mgmt/newdata/cumin/python/cumin/grid/scheduler.py
mgmt/newdata/cumin/python/cumin/grid/submission.py
mgmt/newdata/wooly/python/wooly/forms.strings
Log:
* Improve form text messages
* Avoid a weird cursor type when hovering over "Show more"
* Use get_items, not scheduler.get, to determine if there are any
schedulers at all
* Fix a missing import
Modified: mgmt/newdata/cumin/python/cumin/grid/scheduler.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-08-26 20:29:10 UTC (rev 4231)
+++ mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-08-26 21:07:48 UTC (rev 4232)
@@ -1,5 +1,3 @@
-from random import choice
-
from wooly import *
from wooly.widgets import *
from wooly.forms import *
Modified: mgmt/newdata/cumin/python/cumin/grid/submission.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-08-26 20:29:10 UTC (rev 4231)
+++ mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-08-26 21:07:48 UTC (rev 4232)
@@ -1,6 +1,8 @@
import logging
import shlex
+from random import choice
+
from rosemary.sqlquery import *
from parsley.stringex import partition, rpartition
@@ -107,11 +109,13 @@
self.input.size = 50
self.required = True
- self.help = "This text will identify the submission"
def render_title(self, session):
return "Description"
+ def render_help(self, session):
+ return "This text will identify the submission"
+
class JobSchedulerField(ScalarField):
def __init__(self, app, name, pool_name):
super(JobSchedulerField, self).__init__(app, name, None)
@@ -129,23 +133,24 @@
self.input = self.SchedulerOptions(app, "input", self.param)
self.add_child(self.input)
- self.help = "Submit job to this schedd"
-
def get(self, session):
return self.object.get(session)
def validate(self, session):
super(JobSchedulerField, self).validate(session)
- scheduler = self.get(session)
+ schedulers = self.input.get_items(session)
- if not scheduler:
+ if not schedulers:
error = FormError("There is no schedd to submit to")
self.form.errors.add(session, error)
def render_title(self, session):
return "Schedd"
+ def render_help(self, session):
+ return "Submit the job to this schedd"
+
class SchedulerOptions(OptionInputSet):
def do_process(self, session):
cls = self.app.model.com_redhat_grid.Scheduler
@@ -624,10 +629,16 @@
def render_title(self, session):
return "Image location"
+ def render_help(self, session):
+ return "The path to VM disk image file"
+
class MemoryField(IntegerField):
def render_title(self, session):
return "Memory"
+ def render_help(self, session):
+ return "The VM's memory size in megabytes"
+
class DagJobSubmit(Task):
def __init__(self, app):
super(DagJobSubmit, self).__init__(app)
@@ -699,7 +710,7 @@
self.add_field(self.description)
self.location = self.LocationField(app, "location")
- self.location.help = "Path to the DAG job file"
+ self.location.help = "The path to the DAG job file"
self.location.required = True
self.location.input.size = 50
self.add_field(self.location)
Modified: mgmt/newdata/wooly/python/wooly/forms.strings
===================================================================
--- mgmt/newdata/wooly/python/wooly/forms.strings 2010-08-26 20:29:10 UTC (rev 4231)
+++ mgmt/newdata/wooly/python/wooly/forms.strings 2010-08-26 21:07:48 UTC (rev 4232)
@@ -220,10 +220,14 @@
display: none;
}
-div.heading {
+div.ShowableFieldSet div.heading {
margin: 1em 0;
}
+div.ShowableFieldSet div.heading a {
+ cursor: default;
+}
+
[ShowableFieldSet.javascript]
(function() {
wooly.toggleFieldDisplay = function(id) {
@@ -236,18 +240,18 @@
if (table.getStyle("display") === "table") {
table.setStyle("display", "none");
- a.set("text", "Show extra fields");
+ a.set("text", "Show more >");
} else {
table.setStyle("display", "table");
- a.set("text", "Hide extra fields");
+ a.set("text", "Show fewer <");
}
}
}())
[ShowableFieldSet.html]
-<div id="{id}" class="ShowableFieldSet">
+<div id="{id}" class="{class}">
<div class="heading">
- <a onclick="wooly.toggleFieldDisplay('{id}');" class="action">Show extra fields</a>
+ <a onclick="wooly.toggleFieldDisplay('{id}');" class="action">Show more ></a>
</div>
<table class="FormFieldSet">
13 years, 10 months
rhmessaging commits: r4231 - mgmt/newdata/wooly/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-08-26 16:29:10 -0400 (Thu, 26 Aug 2010)
New Revision: 4231
Modified:
mgmt/newdata/wooly/python/wooly/forms.py
mgmt/newdata/wooly/python/wooly/forms.strings
Log:
Fixes some form validation errors that Jasan ran into; correct some error text
Modified: mgmt/newdata/wooly/python/wooly/forms.py
===================================================================
--- mgmt/newdata/wooly/python/wooly/forms.py 2010-08-26 19:56:41 UTC (rev 4230)
+++ mgmt/newdata/wooly/python/wooly/forms.py 2010-08-26 20:29:10 UTC (rev 4231)
@@ -412,12 +412,22 @@
return self.input.set(session, value)
def validate(self, session):
- value = self.get(session)
+ super(ScalarField, self).validate(session)
- if value in ("", None) and self.required:
- error = MissingValueError(self)
- self.form.errors.add(session, error)
+ if self.required:
+ value = self.get(session)
+ if value is None:
+ error = MissingValueError(self)
+ self.form.errors.add(session, error)
+
+ if isinstance(value, str):
+ value = value.strip()
+
+ if value == "":
+ error = MissingValueError(self)
+ self.form.errors.add(session, error)
+
def render_inputs(self, session, *args):
return self.input.render(session)
@@ -450,6 +460,8 @@
self.add_child(self.input)
def validate(self, session):
+ super(IntegerField, self).validate(session)
+
value = self.get(session)
if value:
@@ -457,8 +469,8 @@
value = int(value)
except:
title = self.render_title(session)
- message = "The '%s' field must be a number" % title
- self.form.errors.append(FormError(message))
+ message = "The '%s' field must be an integer" % title
+ self.form.errors.add(session, FormError(message))
# XXX make this use a RadioInputSet instead?
class RadioField(FormField):
Modified: mgmt/newdata/wooly/python/wooly/forms.strings
===================================================================
--- mgmt/newdata/wooly/python/wooly/forms.strings 2010-08-26 19:56:41 UTC (rev 4230)
+++ mgmt/newdata/wooly/python/wooly/forms.strings 2010-08-26 20:29:10 UTC (rev 4231)
@@ -30,7 +30,7 @@
<div class="FormErrorSet">
<p>
<img src="resource?name=warning-36.png"/>
- Input errors
+ Errors
</p>
<ul>{items}</ul>
13 years, 10 months
rhmessaging commits: r4230 - mgmt/newdata/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-08-26 15:56:41 -0400 (Thu, 26 Aug 2010)
New Revision: 4230
Modified:
mgmt/newdata/cumin/python/cumin/grid/scheduler.py
mgmt/newdata/cumin/python/cumin/grid/submission.py
Log:
To avoid a circular dependency, move the scheduler select field with the job submit code; warn the user if there's no scheduler to submit to
Modified: mgmt/newdata/cumin/python/cumin/grid/scheduler.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-08-26 18:38:46 UTC (rev 4229)
+++ mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-08-26 19:56:41 UTC (rev 4230)
@@ -69,66 +69,6 @@
self.start = DaemonSelectionStart(app, self, "SCHEDD")
self.stop = DaemonSelectionStop(app, self, "SCHEDD")
-class SchedulerSelectField(ScalarField):
- def __init__(self, app, name, pool_name):
- super(SchedulerSelectField, self).__init__(app, name, None)
-
- self.pool_name = pool_name
-
- self.param = IntegerParameter(app, "param")
- self.add_parameter(self.param)
-
- cls = self.app.model.com_redhat_grid.Scheduler
-
- self.object = ObjectAttribute(self, "object", cls, self.param)
- self.add_attribute(self.object)
-
- self.input = self.SchedulerOptions(app, "input", self.param)
- self.add_child(self.input)
-
- def get(self, session):
- return self.object.get(session)
-
- def render_title(self, session):
- return "Schedd"
-
- class SchedulerOptions(OptionInputSet):
- def do_process(self, session):
- cls = self.app.model.com_redhat_grid.Scheduler
- id = self.param.get(session)
-
- if id is None:
- items = self.get_items(session)
-
- if items:
- scheduler = choice(items)
- self.param.set(session, scheduler._id)
-
- super(SchedulerSelectField.SchedulerOptions, self).do_process \
- (session)
-
- def do_get_items(self, session):
- cls = self.app.model.com_redhat_grid.Scheduler
-
- pool_name = self.parent.pool_name.get(session)
-
- if pool_name:
- schedulers = cls.get_selection(session.cursor, Pool=pool_name)
- else:
- schedulers = cls.get_selection(session.cursor)
-
- return schedulers
-
- def render_item_value(self, session, item):
- return item._id
-
- def render_item_content(self, session, item):
- return item.Name
-
- def render_item_selected_attr(self, session, item):
- if item._id == self.param.get(session):
- return "selected=\"selected\""
-
class SchedulerGeneralStatSet(StatSet):
def __init__(self, app, name, object):
super(SchedulerGeneralStatSet, self).__init__(app, name, object)
Modified: mgmt/newdata/cumin/python/cumin/grid/submission.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-08-26 18:38:46 UTC (rev 4229)
+++ mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-08-26 19:56:41 UTC (rev 4230)
@@ -112,6 +112,77 @@
def render_title(self, session):
return "Description"
+class JobSchedulerField(ScalarField):
+ def __init__(self, app, name, pool_name):
+ super(JobSchedulerField, self).__init__(app, name, None)
+
+ self.pool_name = pool_name
+
+ self.param = IntegerParameter(app, "param")
+ self.add_parameter(self.param)
+
+ cls = self.app.model.com_redhat_grid.Scheduler
+
+ self.object = ObjectAttribute(self, "object", cls, self.param)
+ self.add_attribute(self.object)
+
+ self.input = self.SchedulerOptions(app, "input", self.param)
+ self.add_child(self.input)
+
+ self.help = "Submit job to this schedd"
+
+ def get(self, session):
+ return self.object.get(session)
+
+ def validate(self, session):
+ super(JobSchedulerField, self).validate(session)
+
+ scheduler = self.get(session)
+
+ if not scheduler:
+ error = FormError("There is no schedd to submit to")
+ self.form.errors.add(session, error)
+
+ def render_title(self, session):
+ return "Schedd"
+
+ class SchedulerOptions(OptionInputSet):
+ def do_process(self, session):
+ cls = self.app.model.com_redhat_grid.Scheduler
+ id = self.param.get(session)
+
+ if id is None:
+ items = self.get_items(session)
+
+ if items:
+ scheduler = choice(items)
+ self.param.set(session, scheduler._id)
+
+ super(JobSchedulerField.SchedulerOptions, self).do_process \
+ (session)
+
+ def do_get_items(self, session):
+ cls = self.app.model.com_redhat_grid.Scheduler
+
+ pool_name = self.parent.pool_name.get(session)
+
+ if pool_name:
+ schedulers = cls.get_selection(session.cursor, Pool=pool_name)
+ else:
+ schedulers = cls.get_selection(session.cursor)
+
+ return schedulers
+
+ def render_item_value(self, session, item):
+ return item._id
+
+ def render_item_content(self, session, item):
+ return item.Name
+
+ def render_item_selected_attr(self, session, item):
+ if item._id == self.param.get(session):
+ return "selected=\"selected\""
+
class JobAttributesField(MultilineStringField):
def __init__(self, app, name):
super(JobAttributesField, self).__init__(app, name)
@@ -255,10 +326,7 @@
self.directory.help = "Run the process in this directory"
self.add_field(self.directory)
- from scheduler import SchedulerSelectField # XXX
-
- self.scheduler = SchedulerSelectField(app, "scheduler", self.pool_name)
- self.scheduler.help = "Submit job to this schedd"
+ self.scheduler = JobSchedulerField(app, "scheduler", self.pool_name)
self.add_extra_field(self.scheduler)
self.universe = self.UniverseField(app, "universe")
@@ -290,6 +358,9 @@
self.attrs = JobAttributesField(app, "attrs")
self.add_extra_field(self.attrs)
+ def process_display(self, session):
+ self.scheduler.validate(session)
+
def process_submit(self, session):
self.validate(session)
@@ -520,15 +591,15 @@
self.memory.input.param.default = 512
self.add_extra_field(self.memory)
- from scheduler import SchedulerSelectField # XXX
-
- self.scheduler = SchedulerSelectField(app, "scheduler", self.pool_name)
- self.scheduler.help = "Submit job to this schedd"
+ self.scheduler = JobSchedulerField(app, "scheduler", self.pool_name)
self.add_extra_field(self.scheduler)
self.attrs = JobAttributesField(app, "attrs")
self.add_extra_field(self.attrs)
+ def process_display(self, session):
+ self.scheduler.validate(session)
+
def process_submit(self, session):
self.validate(session)
@@ -633,14 +704,15 @@
self.location.input.size = 50
self.add_field(self.location)
- from scheduler import SchedulerSelectField # XXX
-
- self.scheduler = SchedulerSelectField(app, "scheduler", self.pool_name)
+ self.scheduler = JobSchedulerField(app, "scheduler", self.pool_name)
self.add_extra_field(self.scheduler)
self.attrs = JobAttributesField(app, "attrs")
self.add_extra_field(self.attrs)
+ def process_display(self, session):
+ self.scheduler.validate(session)
+
def process_submit(self, session):
self.validate(session)
13 years, 10 months
rhmessaging commits: r4229 - mgmt/newdata/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-08-26 14:38:46 -0400 (Thu, 26 Aug 2010)
New Revision: 4229
Modified:
mgmt/newdata/cumin/python/cumin/objectframe.py
mgmt/newdata/cumin/python/cumin/objectframe.strings
Log:
Fixes the (annoying) summary attribute rendering problem
Modified: mgmt/newdata/cumin/python/cumin/objectframe.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectframe.py 2010-08-26 18:13:59 UTC (rev 4228)
+++ mgmt/newdata/cumin/python/cumin/objectframe.py 2010-08-26 18:38:46 UTC (rev 4229)
@@ -282,6 +282,9 @@
def get_attributes(self, session):
return self.frame.summary_attributes
+class DetailsAttributes(ObjectAttributes):
+ pass
+
class ObjectDetails(Widget):
def __init__(self, app, name, object):
super(ObjectDetails, self).__init__(app, name)
@@ -307,7 +310,7 @@
def render_title(self, session):
return "Details"
- class Headers(ObjectAttributes):
+ class Headers(DetailsAttributes):
def get_attributes(self, session):
obj = self.object.get(session)
return obj._class._headers
@@ -315,7 +318,7 @@
def render_title(self, session):
return "QMF Headers"
- class References(ObjectAttributes):
+ class References(DetailsAttributes):
def get_attributes(self, session):
obj = self.object.get(session)
return obj._class._references
@@ -323,7 +326,7 @@
def render_title(self, session):
return "References"
- class Properties(ObjectAttributes):
+ class Properties(DetailsAttributes):
def get_attributes(self, session):
obj = self.object.get(session)
return obj._class._properties
@@ -331,7 +334,7 @@
def render_title(self, session):
return "Properties"
- class Statistics(ObjectAttributes):
+ class Statistics(DetailsAttributes):
def get_attributes(self, session):
obj = self.object.get(session)
return obj._class._statistics
Modified: mgmt/newdata/cumin/python/cumin/objectframe.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectframe.strings 2010-08-26 18:13:59 UTC (rev 4228)
+++ mgmt/newdata/cumin/python/cumin/objectframe.strings 2010-08-26 18:38:46 UTC (rev 4229)
@@ -1,42 +1,19 @@
[ObjectAttributes.css]
-div.ObjectAttributes h2 {
- margin: 0 0 1em 0;
- font-size: 0.9em;
-}
-
-div.ObjectAttributes table {
- width: 100%;
- margin: 0 0 1em 0;
- border-collapse: collapse;
- font-size: 0.9em;
-}
-
-div.ObjectAttributes th, div.ObjectAttributes td {
- padding: 0.35em 0.5em 0.35em 0;
- text-align: left;
- vertical-align: top;
-}
-
-div.ObjectAttributes thead th {
- font-weight: normal;
- font-style: italic;
- font-size: 0.9em;
- color: #666;
-}
-
-div.ObjectAttributes tbody tr {
- border-top: 1px dotted #ccc;
-}
-
div.ObjectAttributes tbody th {
width: 40%;
font-weight: normal;
+ color: #666;
}
div.ObjectAttributes tbody td {
width: 60%;
}
+div.ObjectAttributes th, div.ObjectAttributes td {
+ text-align: left;
+ vertical-align: top;
+}
+
[ObjectAttributes.html]
<div id="{id}" class="{class}">
<h2>{title}</h2>
@@ -84,20 +61,13 @@
div.SummaryAttributes {
width: 20em;
margin: 0 0 1.5em 0;
+ font-size: 0.9em;
}
-div.SummaryAttributes tbody tr {
- border-top: none;
-}
-
div.SummaryAttributes tbody th, div.SummaryAttributes tbody td {
padding: 0.125em 0;
}
-div.SummaryAttributes tbody th {
- color: #666;
-}
-
[SummaryAttributes.html]
<div id="{id}" class="{class}">
<table>
@@ -172,6 +142,35 @@
[ObjectViewContext.html]
<div class="{class}">{links}</div>
+[DetailsAttributes.css]
+div.DetailsAttributes h2 {
+ margin: 0 0 1em 0;
+ font-size: 0.9em;
+}
+
+div.DetailsAttributes table {
+ width: 100%;
+ margin: 0 0 1em 0;
+ border-collapse: collapse;
+ font-size: 0.9em;
+}
+
+div.DetailsAttributes th, div.DetailsAttributes td {
+ padding: 0.35em 0.5em 0.35em 0;
+ text-align: left;
+ vertical-align: top;
+}
+
+div.DetailsAttributes thead th {
+ font-weight: normal;
+ font-style: italic;
+ color: #666;
+}
+
+div.DetailsAttributes tbody tr {
+ border-top: 1px dotted #ccc;
+}
+
[ObjectDetails.html]
{headers}
13 years, 10 months
rhmessaging commits: r4228 - mgmt/newdata/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2010-08-26 14:13:59 -0400 (Thu, 26 Aug 2010)
New Revision: 4228
Modified:
mgmt/newdata/cumin/python/cumin/grid/submission.py
Log:
Don't drop extra attributes that evaluate to false; add logging for submitted job ads
Modified: mgmt/newdata/cumin/python/cumin/grid/submission.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-08-26 14:39:22 UTC (rev 4227)
+++ mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-08-26 18:13:59 UTC (rev 4228)
@@ -212,8 +212,7 @@
put("Err", stderr)
put("UserLog", usrlog)
- for name, value in attrs.items():
- put(name, value)
+ ad.update(attrs)
descriptors = dict()
descriptors["Requirements"] = "com.redhat.grid.Expression"
@@ -222,6 +221,8 @@
invoc.description = "Submit job '%s'" % description
+ log_job_ad(ad)
+
self.qmf_call(invoc, scheduler, "SubmitJob", ad)
class JobSubmitForm(ObjectTaskForm):
@@ -452,9 +453,6 @@
"JobVMMemory, " + \
"ImageSize / 1024.000000))"
- for name, value in attrs.items():
- ad[name] = value
-
# VM
ad["VMPARAM_Kvm_Disk"] = "%s:vda:w" % image
@@ -481,6 +479,10 @@
ad["Requirements"] = " && ".join(exprs)
+ # Extra attributes
+
+ ad.update(attrs)
+
# Descriptors
descriptors = dict()
@@ -492,6 +494,8 @@
invoc.description = "Submit VM job '%s'" % description
+ log_job_ad(ad)
+
self.qmf_call(invoc, scheduler, "SubmitJob", ad)
class VmJobSubmitForm(ObjectTaskForm):
@@ -598,6 +602,8 @@
ad["Environment"] = " ".join(vars)
+ ad.update(attrs)
+
descriptors = dict()
descriptors["Requirements"] = "com.redhat.grid.Expression"
descriptors["OnExitRemove"] = "com.redhat.grid.Expression"
@@ -606,6 +612,8 @@
invoc.description = "Submit DAG job '%s'" % description
+ log_job_ad(ad)
+
self.qmf_call(invoc, scheduler, "SubmitJob", ad)
class DagJobSubmitForm(ObjectTaskForm):
@@ -654,3 +662,9 @@
class LocationField(StringField):
def render_title(self, session):
return "DAG file location"
+
+def log_job_ad(ad):
+ log.debug("Job ad:")
+
+ for item in sorted(ad.items()):
+ log.debug(" %-34s %r", *item)
13 years, 10 months
rhmessaging commits: r4227 - in mgmt/newdata/cumin/python/cumin: inventory and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2010-08-26 10:39:22 -0400 (Thu, 26 Aug 2010)
New Revision: 4227
Modified:
mgmt/newdata/cumin/python/cumin/grid/slot.strings
mgmt/newdata/cumin/python/cumin/inventory/system.py
Log:
Fix for BZ 625060: Fixed exception when slot is clicked from inventory page in png vis.
Modified: mgmt/newdata/cumin/python/cumin/grid/slot.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/slot.strings 2010-08-26 13:32:59 UTC (rev 4226)
+++ mgmt/newdata/cumin/python/cumin/grid/slot.strings 2010-08-26 14:39:22 UTC (rev 4227)
@@ -766,9 +766,11 @@
}())
function go_to_slot(id) {
- var branch = wooly.session.branch(show_slot_url);
- branch[branch.frame + ".id"] = id;
- window.location.href = branch.marshal();
+ if (show_slot_url != "") {
+ var branch = wooly.session.branch(show_slot_url);
+ branch[branch.frame + ".id"] = id;
+ window.location.href = branch.marshal();
+ }
}
function vis_clicked(slot) {
go_to_slot(slot);
Modified: mgmt/newdata/cumin/python/cumin/inventory/system.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-08-26 13:32:59 UTC (rev 4226)
+++ mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-08-26 14:39:22 UTC (rev 4227)
@@ -102,6 +102,9 @@
return sess.marshal()
+ def render_slot_url(self, session):
+ return ""
+
def get_scheduler_select(self, session):
system = self.system.get(session)
return "system='%s'" % system.nodeName
13 years, 10 months