rhmessaging commits: r2405 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-04 11:14:07 -0400 (Thu, 04 Sep 2008)
New Revision: 2405
Modified:
mgmt/trunk/cumin/python/cumin/page.py
Log:
Remove JobFrame from MainFrame because it resides under pool
Modified: mgmt/trunk/cumin/python/cumin/page.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.py 2008-09-04 14:53:45 UTC (rev 2404)
+++ mgmt/trunk/cumin/python/cumin/page.py 2008-09-04 15:14:07 UTC (rev 2405)
@@ -94,9 +94,6 @@
self.__pool = PoolFrame(app, "pool")
self.add_mode(self.__pool)
- self.__job = JobFrame(app, "job")
- self.add_mode(self.__job)
-
self.__system = SystemFrame(app, "system")
self.add_mode(self.__system)
@@ -172,11 +169,6 @@
frame.set_object(session, pool)
return self.page.set_current_frame(session, frame)
- def show_job(self, session, job):
- frame = self.show_mode(session, self.__job)
- frame.set_object(session, job)
- return self.page.set_current_frame(session, frame)
-
def show_system(self, session, system):
frame = self.show_mode(session, self.__system)
frame.set_object(session, system)
17 years, 8 months
rhmessaging commits: r2404 - store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2008-09-04 10:53:45 -0400 (Thu, 04 Sep 2008)
New Revision: 2404
Modified:
store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
Log:
RHM-6 : Fixed error reporting if the input directory does not exist.
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2008-09-04 14:50:32 UTC (rev 2403)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2008-09-04 14:53:45 UTC (rev 2404)
@@ -76,11 +76,8 @@
_fromDir = new File(fromDir);
if (!_fromDir.exists())
{
- if (!_fromDir.mkdirs())
- {
- throw new IllegalArgumentException("BDBStore path " + fromDir + " could not be read. "
- + "Ensure the path is correct and that the permissions are correct.");
- }
+ throw new IllegalArgumentException("BDBStore path " + fromDir + " could not be read. "
+ + "Ensure the path is correct and that the permissions are correct.");
}
_toDir = new File(toDir);
17 years, 8 months
rhmessaging commits: r2403 - store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2008-09-04 10:50:32 -0400 (Thu, 04 Sep 2008)
New Revision: 2403
Modified:
store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
Log:
RHM-6 : Updated usage() and improved command argument parsing.
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2008-09-04 11:35:26 UTC (rev 2402)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2008-09-04 14:50:32 UTC (rev 2403)
@@ -102,7 +102,9 @@
/**
* Upgrade a Store of a specified version to the latest version.
+ *
* @param version the version of the current store
+ *
* @throws Exception
*/
public void upgradeFromVersion(int version) throws Exception
@@ -115,11 +117,11 @@
*
* @param version the version of the current store
* @param fromDir the directory with the old Store
- * @param toDir the directrory to hold the newly Upgraded Store
+ * @param toDir the directrory to hold the newly Upgraded Store
*
- * @throws Exception due to Virtualhost/MessageStore.close() being rather poor at exception handling
+ * @throws Exception due to Virtualhost/MessageStore.close() being rather poor at exception handling
* @throws DatabaseException if there is a problem with the store formats
- * @throws AMQException if there is an issue creating Qpid data structures
+ * @throws AMQException if there is an issue creating Qpid data structures
*/
public void upgradeFromVersion(int version, File fromDir, File toDir) throws Exception
{
@@ -148,7 +150,7 @@
_newVirtualHost.close();
_oldVirtualHost.close();
-
+
//Shutdown the AR that the Vhosts will have created.
ApplicationRegistry.remove(1);
}
@@ -220,9 +222,25 @@
private static void usage()
{
- System.out.println("usage: -fromDir <path-to-store-to-upgrade> -toDir <path-to-location-to-write-upgraded-db>");
+ System.out.println("usage: " + FROM_DIR + " <path-to-store-to-upgrade> " + TO_DIR + " <path-to-location-to-write-upgraded-db>");
}
+ private static String getArg(String[] args, String arg)
+ {
+ if (args[0].equals(arg))
+ {
+ return args[1];
+ }
+ else if (args[2].equals(arg))
+ {
+ return args[3];
+ }
+ else
+ {
+ return null;
+ }
+ }
+
public static void main(String[] args) throws Exception
{
String fromDir, toDir;
@@ -234,9 +252,16 @@
System.exit(1);
}
- fromDir = args[1];
- toDir = args[3];
+ fromDir = getArg(args, FROM_DIR);
+ toDir = getArg(args, TO_DIR);
+
+ if (fromDir == null || toDir == null)
+ {
+ usage();
+ System.exit(1);
+ }
+
new BDBStoreUpgrade(fromDir, toDir).upgradeFromVersion(1);
System.out.println("Upgrade complete");
17 years, 8 months
rhmessaging commits: r2402 - in store/branches/java/broker-queue-refactor/java/bdbstore: etc/scripts and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2008-09-04 07:35:26 -0400 (Thu, 04 Sep 2008)
New Revision: 2402
Added:
store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh
Modified:
store/branches/java/broker-queue-refactor/java/bdbstore/build.xml
Log:
RHM-6 : Provided packaging and a start script.
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/build.xml
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/build.xml 2008-09-03 21:06:39 UTC (rev 2401)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/build.xml 2008-09-04 11:35:26 UTC (rev 2402)
@@ -3,6 +3,7 @@
-->
<project name="BDBStore" default="build">
+ <property name="project.version" value="M3"/>
<property name="src.tools.dir" location="src/tools/java"/>
<property name="src.main.dir" location="src/main/java"/>
<property name="src.test.dir" location="src/test/java"/>
@@ -12,7 +13,10 @@
<property name="build.test.classes" location="build/test/classes"/>
<property name="build.tools.classes" location="build/tools/classes"/>
<property name="build.results" location="build/results"/>
+ <property name="bdbstore.jar" location="${build.dir}/qpid-bdbstore-${project.version}.jar"/>
+ <property name="bdbtools.jar" location="${build.dir}/qpid-bdbtools-${project.version}.jar"/>
+
<property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
<available property="src.test.dir.exists" file="${src.test.dir}"/>
@@ -73,8 +77,8 @@
</target>
<target name="jar" depends="build">
- <jar destfile="build/qpid-bdbstore.jar" basedir="${build.classes}"/>
- <jar destfile="build/qpid-tools.jar" basedir="${build.tools.classes}"/>
+ <jar destfile="${bdbstore.jar}" basedir="${build.classes}"/>
+ <jar destfile="${bdbtools.jar}" basedir="${build.tools.classes}"/>
</target>
<target name="test" depends="build-tests" if="src.test.dir.exists"
Added: store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh (rev 0)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh 2008-09-04 11:35:26 UTC (rev 2402)
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Parse arguements taking all - prefixed args as JAVA_OPTS
+for arg in "$@"; do
+ if [[ $arg == -java:* ]]; then
+ JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2` "
+ else
+ ARGS="${ARGS}$arg "
+ fi
+done
+
+if [ -z "$QPID_HOME" ]; then
+ export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+ export PATH=${PATH}:${QPID_HOME}/bin
+fi
+
+if [ -z "$BDB_HOME" ]; then
+ export BDB_HOME=$(dirname $(dirname $(readlink -f $0)))
+fi
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx256m -Damqj.logging.level=warn ${JAVA_OPTS} -cp $BDB_HOME/lib/qpid-bdbtools-M3.jar:$QPID_HOME/lib/qpid-bdbstore-M3.jar:$BDB_HOME/lib/qpid-incubating.jar org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade ${ARGS}
Property changes on: store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh
___________________________________________________________________
Name: svn:executable
+ *
17 years, 8 months
rhmessaging commits: r2401 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-03 17:06:39 -0400 (Wed, 03 Sep 2008)
New Revision: 2401
Modified:
mgmt/trunk/cumin/python/cumin/job.py
mgmt/trunk/cumin/python/cumin/job.strings
Log:
Fix sql and item count for jobs joined with schedulers
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-09-03 20:16:30 UTC (rev 2400)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-09-03 21:06:39 UTC (rev 2401)
@@ -68,9 +68,20 @@
col.alignment = "right"
self.add_hidden_column(col)
- def render_title(self, session):
- return "Jobs %s" % fmt_count(Job.select().count())
+ def get_args(self, session):
+ return self.frame.get_args(session)
+# def render_sql_where(self, session, job):
+# subquery = \
+# "select 1 from broker_group_mapping " + \
+# "where broker_group_id = %i " % group.id + \
+# "and broker_registration_id = br.id"
+#
+# return "where exists (%s)" % subquery
+
+ def render_title(self, session, job):
+ return "Jobs %s" % fmt_count(self.get_item_count(session, job))
+
class ArgsColumn(SqlTableColumn):
def render_title(self, session, data):
return "Arguments"
@@ -101,9 +112,12 @@
def render_content(self, session, data):
job = Identifiable(data["id"])
- branch = session.branch()
- self.frame.show_job(branch, job).show_view(branch)
- return fmt_olink(branch, job, name=data[self.name])
+ if data[self.name]:
+ branch = session.branch()
+ self.frame.show_job(branch, job).show_view(branch)
+ return fmt_olink(branch, job, name=data[self.name])
+ else:
+ return data[self.name] # none
class StatusColumn(SqlTableColumn):
def render_title(self, session, data):
@@ -133,9 +147,12 @@
def render_content(self, session, data):
scheduler = Identifiable(data["scheduler_id"])
- branch = session.branch()
- self.frame.show_scheduler(branch, scheduler).show_view(branch)
- return fmt_olink(branch, scheduler, name=data["scheduler"])
+ if data["scheduler"]:
+ branch = session.branch()
+ self.frame.show_scheduler(branch, scheduler).show_view(branch)
+ return fmt_olink(branch, scheduler, name=data["scheduler"])
+ else:
+ return data["scheduler"]
class CommandColumn(SqlTableColumn):
def render_title(self, session, data):
Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings 2008-09-03 20:16:30 UTC (rev 2400)
+++ mgmt/trunk/cumin/python/cumin/job.strings 2008-09-03 21:06:39 UTC (rev 2401)
@@ -18,7 +18,7 @@
from job as j
left outer join job_stats as c on c.id = j.stats_curr_id
left outer join job_stats as p on p.id = j.stats_prev_id
-left outer join scheduler as s on s.id = j.scheduler_id
+inner join scheduler as s on s.id = j.scheduler_id
{sql_where}
{sql_orderby}
{sql_limit}
@@ -26,7 +26,7 @@
[JobSet.count_sql]
select count(1)
from job as j
-left outer join job_stats as c on c.id = j.stats_curr_id
+inner join scheduler as s on s.id = j.scheduler_id
{sql_where}
17 years, 8 months
rhmessaging commits: r2400 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-03 16:16:30 -0400 (Wed, 03 Sep 2008)
New Revision: 2400
Modified:
mgmt/trunk/cumin/python/cumin/page.strings
mgmt/trunk/cumin/python/cumin/widgets.strings
Log:
Move property edit styles to a more "global" location
Modified: mgmt/trunk/cumin/python/cumin/page.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.strings 2008-09-03 20:15:49 UTC (rev 2399)
+++ mgmt/trunk/cumin/python/cumin/page.strings 2008-09-03 20:16:30 UTC (rev 2400)
@@ -398,6 +398,63 @@
line-height:0.01px;
}
+table.Editable input.edit_string,
+table.Editable textarea.edit_bigstring,
+div.inline_help span.edit_string {
+ border: 1px solid #CCCCCC;
+}
+table.Editable input.edit_number,
+div.inline_help span.edit_number {
+ border: 1px dashed #66CCFF;
+}
+table.Editable input.numeric_error,
+div.inline_help span.numeric_error {
+ border: 1px dashed #FF0000;
+}
+table.Editable span.edit_readonly {
+ background-color: #FFFFFF;
+ color: #444444;
+}
+
+table.Editable input.edit_string,
+table.Editable input.edit_number,
+table.Editable input.numeric_error {
+ width: 20em;
+}
+table.Editable textarea.edit_bigstring {
+ width: 25em;
+}
+table.Editable div.error {
+ color: #FF0000;
+ font-size: 0.9em;
+}
+
+form.editform {
+ border:0 none !important;
+ width: 100% !important;
+}
+
+div.inline_help span.edit_string,
+div.inline_help span.edit_number,
+div.inline_help span.numeric_error {
+ color: #444444;
+ font-weight: normal;
+ padding:0.05em 0.2em;
+}
+div.inline_help ul.legend {
+ margin:0.5em 1em;
+}
+div.inline_help ul.legend li {
+ line-height: 1.75em;
+}
+span.prop_example {
+ font-size: 0.9em;
+}
+span.prop_example:before {
+ content: "Example:";
+ padding-right: 0.25em;
+}
+
[CuminPage.javascript]
var cumin;
@@ -658,3 +715,4 @@
<ul class="TabbedModeSet tabs">{tabs}</ul>
<div class="TabbedModeSet mode">{mode}</div>
</div>
+
Modified: mgmt/trunk/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.strings 2008-09-03 20:15:49 UTC (rev 2399)
+++ mgmt/trunk/cumin/python/cumin/widgets.strings 2008-09-03 20:16:30 UTC (rev 2400)
@@ -303,64 +303,6 @@
{items}
</ul>
-[CuminEditableProperties.css]
-table.Editable input.edit_string,
-table.Editable textarea.edit_bigstring,
-div.inline_help span.edit_string {
- border: 1px solid #CCCCCC;
-}
-table.Editable input.edit_number,
-div.inline_help span.edit_number {
- border: 1px dashed #66CCFF;
-}
-table.Editable input.numeric_error,
-div.inline_help span.numeric_error {
- border: 1px dashed #FF0000;
-}
-table.Editable span.edit_readonly {
- background-color: #FFFFFF;
- color: #444444;
-}
-
-table.Editable input.edit_string,
-table.Editable input.edit_number,
-table.Editable input.numeric_error {
- width: 20em;
-}
-table.Editable textarea.edit_bigstring {
- width: 25em;
-}
-table.Editable div.error {
- color: #FF0000;
- font-size: 0.9em;
-}
-
-form.editform {
- border:0 none !important;
- width: 100% !important;
-}
-
-div.inline_help span.edit_string,
-div.inline_help span.edit_number,
-div.inline_help span.numeric_error {
- color: #444444;
- font-weight: normal;
- padding:0.05em 0.2em;
-}
-div.inline_help ul.legend {
- margin:0.5em 1em;
-}
-div.inline_help ul.legend li {
- line-height: 1.75em;
-}
-span.prop_example {
- font-size: 0.9em;
-}
-span.prop_example:before {
- content: "Example:";
- padding-right: 0.25em;
-}
-
[CuminEditableProperties.html]
<table class="PropertySet Editable">
<thead>
17 years, 8 months
rhmessaging commits: r2399 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-03 16:15:49 -0400 (Wed, 03 Sep 2008)
New Revision: 2399
Modified:
mgmt/trunk/cumin/python/cumin/job.py
mgmt/trunk/cumin/python/cumin/job.strings
Log:
Refactor JobEditAds to avoid unnessary middle classes
Add scheduler column to jobset
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-09-03 20:12:35 UTC (rev 2398)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-09-03 20:15:49 UTC (rev 2399)
@@ -11,7 +11,7 @@
from parameters import *
from formats import *
from util import *
-#from scheduler import *
+from scheduler import *
#from submitter import *
from system import *
@@ -38,8 +38,8 @@
#col = self.SubmitterColumn(app, "submitter")
#self.add_hidden_column(col)
- #col = self.SchedulerColumn(app, "scheduler")
- #self.add_hidden_column(col)
+ col = self.SchedulerColumn(app, "scheduler")
+ self.add_hidden_column(col)
col = self.ClusterIdColumn(app, "cluster_id")
col.alignment = "right"
@@ -127,15 +127,15 @@
# self.frame.show_job(branch, job).show_view(branch)
# return fmt_olink(branch, job, name=data["submitter"])
-# class SchedulerColumn(SqlTableColumn):
-# def render_title(self, session, data):
-# return "Scheduler"
-#
-# def render_content(self, session, data):
-# job = Identifiable(data["id"])
-# branch = session.branch()
-# self.frame.show_job(branch, job).show_view(branch)
-# return fmt_olink(branch, job, name=data["scheduler"])
+ class SchedulerColumn(SqlTableColumn):
+ def render_title(self, session, data):
+ return "Scheduler"
+
+ def render_content(self, session, data):
+ scheduler = Identifiable(data["scheduler_id"])
+ branch = session.branch()
+ self.frame.show_scheduler(branch, scheduler).show_view(branch)
+ return fmt_olink(branch, scheduler, name=data["scheduler"])
class CommandColumn(SqlTableColumn):
def render_title(self, session, data):
@@ -168,8 +168,8 @@
self.__edit_ads = JobEditAds(app, "editads")
self.add_mode(self.__edit_ads)
- #self.__scheduler = SchedulerFrame(app, "scheduler")
- #self.add_mode(self.__scheduler)
+ self.__scheduler = SchedulerFrame(app, "scheduler")
+ self.add_mode(self.__scheduler)
#self.__submitter = SubmitterFrame(app, "submitter")
#self.add_mode(self.__submitter)
@@ -298,8 +298,110 @@
def render_title(self, session, job):
return "Ad"
+class JobAdsSet(PropertySet):
+ def __init__(self, app, name):
+ super(JobAdsSet, self).__init__(app, name, )
+# self.got_data = False
+ self.item_renderer = JobPropertyRenderer(self, "ad_html")
-class JobEditAds(CuminForm, CuminEditableProperties):
+ def get_args(self, session):
+ return self.frame.get_args(session)
+
+ def do_get_items(self, session, job):
+
+# def completion(status, args=None):
+# self.got_data = True
+#
+# ads = dict()
+# model = self.app.model
+# job.GetAd(model.data, completion, ads)
+# wait(self.got_data)
+
+ # stolen straight for qpid-tool
+ ads = {u'CondorPlatform': u'$CondorPlatform: I386-LINUX_RHEL5 $',
+ u'KillSig': u'SIGTERM',
+ u'TransferFiles': u'ONEXIT',
+ u'Requirements': u'(Arch == "INTEL") && (OpSys == "LINUX") && (Disk >= DiskUsage) && ((Memory * 1024) >= ImageSize) && ((HasFileTransfer) || (TARGET.FileSystemDomain == MY.FileSystemDomain))',
+ u'ImageSize': 20,
+ u'TargetType': u'Machine',
+ u'OnExitHold': u'FALSE',
+ u'NumCkpts': 0,
+ u'PeriodicRelease': u'FALSE',
+ u'BufferBlockSize': 32768,
+ u'Environment': u'',
+ u'RootDir': u'/',
+ u'JobPrio': 0,
+ u'MinHosts': 1,
+ u'WantCheckpoint': u'FALSE',
+ u'CumulativeSuspensionTime': 0,
+ u'WantRemoteSyscalls': u'FALSE',
+ u'FileSystemDomain': u'mrg2.lab.bos.redhat.com',
+ u'GlobalJobId': u'mrg-test(a)#1219326763#1.0',
+ u'ExitStatus': 0,
+ u'WhenToTransferOutput': u'ON_EXIT',
+ u'CurrentHosts': 0,
+ u'ProcId': 0,
+ u'ImageSize_RAW': 20,
+ u'Iwd': u'/home/remote/mfarrell',
+ u'HoldReasonCode': 15,
+ u'NumSystemHolds': 0,
+ u'PeriodicHold': u'FALSE',
+ u'Args': u'100',
+ u'ClusterId': 1,
+ u'OnExitRemove': u'TRUE',
+ u'RemoteWallClockTime': 0,
+ u'HoldReason': u"submitted on hold at user's request",
+ u'NiceUser': u'FALSE',
+ u'PeriodicRemove': u'FALSE',
+ u'UserLog': u'/home/remote/mfarrell/log.1.0',
+ u'MyType': u'Job',
+ u'WantRemoteIO': u'TRUE',
+ u'LocalUserCpu': 0,
+ u'BufferSize': 524288,
+ u'ScheddBday': 12059630,
+ u'CompletionDate': 0,
+ u'JobLeaseDuration': 1200,
+ u'LastSuspensionTime': 0,
+ u'NumRestarts': 0,
+ u'Err': u'/dev/null',
+ u'QDate': 11367211,
+ u'RemoteSysCpu': 0,
+ u'Cmd': u'/bin/sleep',
+ u'TransferOut': u'FALSE',
+ u'DiskUsage_RAW': 20,
+ u'ExecutableSize': 20,
+ u'Owner': u'mfarrell',
+ u'LeaveJobInQueue': u'FALSE',
+ u'JobStatus': 5,
+ u'ExecutableSize_RAW': 20,
+ u'JobUniverse': 5,
+ u'DiskUsage': 20,
+ u'EnteredCurrentStatus': 11367211,
+ u'TotalSuspensions': 0,
+ u'ShouldTransferFiles': u'IF_NEEDED',
+ u'NumCkpts_RAW': 0,
+ u'MaxHosts': 1,
+ u'CommittedTime': 0,
+ u'In': u'/dev/null',
+ u'CoreSize': 0,
+ u'Rank': 0,
+ u'RemoteUserCpu': 0,
+ u'User': u'mfarrell(a)mrg2.lab.bos.redhat.com',
+ u'LocalSysCpu': 0,
+ u'TransferErr': u'FALSE',
+ u'ExitBySignal': u'FALSE',
+ u'CondorVersion': u'$CondorVersion: 7.0.4 Aug 6 2008 BuildID: RH-7.0.4-4.el5 $',
+ u'TransferIn': u'FALSE',
+ u'JobNotification': 0,
+ u'NumJobStarts': 0,
+ u'Out': u'/dev/null'}
+
+ cls = self.app.model.get_class_by_object(job)
+ keys = ads.keys()
+ keys.sort()
+ return [[x, ads[x], cls] for x in keys]
+
+class JobEditAds(CuminForm, JobAdsSet):
def __init__(self, app, name):
super(JobEditAds, self).__init__(app, name)
@@ -308,12 +410,8 @@
self.add_parameter(self.ads)
self.add_form_parameter(self.ads)
- self.__items = JobAdsSet(app, name)
- self.add_child(self.__items)
+ self.item_renderer = EditablePropertyRenderer(self, "property_html")
- self.props = CuminProperties(app, "properties")
- #self.add_child(props)
-
def get_args(self, session):
return self.frame.get_args(session)
@@ -328,7 +426,7 @@
keys.sort()
return [self.gen_item(x, ads[x]["value"], cls, dtype=ads[x]["type"], error=ads[x]) for x in keys]
else:
- items = self.__items.do_get_items(session, job)
+ items = super(JobEditAds,self).do_get_items(session, job)
return [self.gen_item(x[0], x[1], cls) for x in items]
def gen_item(self, name, value, cls, dtype=None, error=None):
@@ -410,109 +508,6 @@
props = None
return name, value, props
-class JobAdsSet(PropertySet):
- def __init__(self, app, name):
- super(JobAdsSet, self).__init__(app, name, )
-# self.got_data = False
- self.item_renderer = JobPropertyRenderer(self, "ad_html")
-
- def get_args(self, session):
- return self.frame.get_args(session)
-
- def do_get_items(self, session, job):
-
-# def completion(status, args=None):
-# self.got_data = True
-#
-# ads = dict()
-# model = self.app.model
-# job.GetAd(model.data, completion, ads)
-# wait(self.got_data)
-
- # stolen straight for qpid-tool
- ads = {u'CondorPlatform': u'$CondorPlatform: I386-LINUX_RHEL5 $',
- u'KillSig': u'SIGTERM',
- u'TransferFiles': u'ONEXIT',
- u'Requirements': u'(Arch == "INTEL") && (OpSys == "LINUX") && (Disk >= DiskUsage) && ((Memory * 1024) >= ImageSize) && ((HasFileTransfer) || (TARGET.FileSystemDomain == MY.FileSystemDomain))',
- u'ImageSize': 20,
- u'TargetType': u'Machine',
- u'OnExitHold': u'FALSE',
- u'NumCkpts': 0,
- u'PeriodicRelease': u'FALSE',
- u'BufferBlockSize': 32768,
- u'Environment': u'',
- u'RootDir': u'/',
- u'JobPrio': 0,
- u'MinHosts': 1,
- u'WantCheckpoint': u'FALSE',
- u'CumulativeSuspensionTime': 0,
- u'WantRemoteSyscalls': u'FALSE',
- u'FileSystemDomain': u'mrg2.lab.bos.redhat.com',
- u'GlobalJobId': u'mrg-test(a)#1219326763#1.0',
- u'ExitStatus': 0,
- u'WhenToTransferOutput': u'ON_EXIT',
- u'CurrentHosts': 0,
- u'ProcId': 0,
- u'ImageSize_RAW': 20,
- u'Iwd': u'/home/remote/mfarrell',
- u'HoldReasonCode': 15,
- u'NumSystemHolds': 0,
- u'PeriodicHold': u'FALSE',
- u'Args': u'100',
- u'ClusterId': 1,
- u'OnExitRemove': u'TRUE',
- u'RemoteWallClockTime': 0,
- u'HoldReason': u"submitted on hold at user's request",
- u'NiceUser': u'FALSE',
- u'PeriodicRemove': u'FALSE',
- u'UserLog': u'/home/remote/mfarrell/log.1.0',
- u'MyType': u'Job',
- u'WantRemoteIO': u'TRUE',
- u'LocalUserCpu': 0,
- u'BufferSize': 524288,
- u'ScheddBday': 12059630,
- u'CompletionDate': 0,
- u'JobLeaseDuration': 1200,
- u'LastSuspensionTime': 0,
- u'NumRestarts': 0,
- u'Err': u'/dev/null',
- u'QDate': 11367211,
- u'RemoteSysCpu': 0,
- u'Cmd': u'/bin/sleep',
- u'TransferOut': u'FALSE',
- u'DiskUsage_RAW': 20,
- u'ExecutableSize': 20,
- u'Owner': u'mfarrell',
- u'LeaveJobInQueue': u'FALSE',
- u'JobStatus': 5,
- u'ExecutableSize_RAW': 20,
- u'JobUniverse': 5,
- u'DiskUsage': 20,
- u'EnteredCurrentStatus': 11367211,
- u'TotalSuspensions': 0,
- u'ShouldTransferFiles': u'IF_NEEDED',
- u'NumCkpts_RAW': 0,
- u'MaxHosts': 1,
- u'CommittedTime': 0,
- u'In': u'/dev/null',
- u'CoreSize': 0,
- u'Rank': 0,
- u'RemoteUserCpu': 0,
- u'User': u'mfarrell(a)mrg2.lab.bos.redhat.com',
- u'LocalSysCpu': 0,
- u'TransferErr': u'FALSE',
- u'ExitBySignal': u'FALSE',
- u'CondorVersion': u'$CondorVersion: 7.0.4 Aug 6 2008 BuildID: RH-7.0.4-4.el5 $',
- u'TransferIn': u'FALSE',
- u'JobNotification': 0,
- u'NumJobStarts': 0,
- u'Out': u'/dev/null'}
-
- cls = self.app.model.get_class_by_object(job)
- keys = ads.keys()
- keys.sort()
- return [[x, ads[x], cls] for x in keys]
-
class JobAdsViewer(JobAdsSet):
def __init__(self, app, name):
super(JobAdsViewer, self).__init__(app, name)
@@ -667,7 +662,7 @@
self.set_default_column_name("global_job_id")
self.show_column("cmd")
#self.show_column("submitter")
- #self.show_column("scheduler")
+ self.show_column("scheduler")
self.show_column("job_status")
self.__remove = self.Remove(app, "remove", self)
Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings 2008-09-03 20:12:35 UTC (rev 2398)
+++ mgmt/trunk/cumin/python/cumin/job.strings 2008-09-03 20:15:49 UTC (rev 2399)
@@ -12,10 +12,13 @@
j.global_job_id,
/* j.owner as submitter, */
j.title,
+ s.name as scheduler,
+ j.scheduler_id,
j.cmd
from job as j
left outer join job_stats as c on c.id = j.stats_curr_id
left outer join job_stats as p on p.id = j.stats_prev_id
+left outer join scheduler as s on s.id = j.scheduler_id
{sql_where}
{sql_orderby}
{sql_limit}
@@ -175,3 +178,8 @@
{help} {submit} {cancel}
<div>{hidden_inputs}</div>
</form>
+
+[JobEditAds.property_html]
+<tr>
+ <th>{title}</th><td>{value}</td><td>{inline_help}</td>
+</tr>
17 years, 8 months
rhmessaging commits: r2398 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-03 16:12:35 -0400 (Wed, 03 Sep 2008)
New Revision: 2398
Modified:
mgmt/trunk/cumin/python/cumin/binding.py
mgmt/trunk/cumin/python/cumin/brokerlink.py
mgmt/trunk/cumin/python/cumin/queue.py
Log:
Remove unneeded calls to clear the DictParameter in post_process()
Modified: mgmt/trunk/cumin/python/cumin/binding.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.py 2008-09-03 19:54:29 UTC (rev 2397)
+++ mgmt/trunk/cumin/python/cumin/binding.py 2008-09-03 20:12:35 UTC (rev 2398)
@@ -331,9 +331,6 @@
if phase:
self.state.set(session, phase)
- def post_process(self, session):
- self.dict_param.clear()
-
def get_binding_errors(self, session, queue_name):
form_binding_info = self.process_binding_info(session, queue_name)
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-09-03 19:54:29 UTC (rev 2397)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-09-03 20:12:35 UTC (rev 2398)
@@ -579,9 +579,6 @@
return not len(errors)
- def post_process(self, session):
- self.host.clear()
-
def process_submit(self, session):
super_error = super(BrokerLinkAdd, self).validate(session)
Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py 2008-09-03 19:54:29 UTC (rev 2397)
+++ mgmt/trunk/cumin/python/cumin/queue.py 2008-09-03 20:12:35 UTC (rev 2398)
@@ -341,9 +341,6 @@
def pre_process(self, session):
self.bindings.pre_process(session)
- def post_process(self, session):
- self.bindings.post_process(session)
-
def validate(self, session, queue_name):
super_error = super(QueueForm, self).validate(session)
(errors, form_binding_info) = self.bindings.get_binding_errors(session, queue_name)
@@ -530,9 +527,6 @@
def pre_process(self, session):
self.bindings.pre_process(session)
- def post_process(self, session):
- self.bindings.post_process(session)
-
def process_submit(self, session):
queue = self.frame.get_object(session)
(errors, form_binding_info) = self.bindings.get_binding_errors(session, queue.name)
17 years, 8 months
rhmessaging commits: r2397 - mgmt/trunk/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-03 15:54:29 -0400 (Wed, 03 Sep 2008)
New Revision: 2397
Modified:
mgmt/trunk/cumin/python/wooly/widgets.py
Log:
Restore inadvertent deletion of none-ifying for property values
Modified: mgmt/trunk/cumin/python/wooly/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/wooly/widgets.py 2008-09-03 19:49:09 UTC (rev 2396)
+++ mgmt/trunk/cumin/python/wooly/widgets.py 2008-09-03 19:54:29 UTC (rev 2397)
@@ -420,6 +420,8 @@
if type(value) is str:
value = escape(value)
+ elif value is None:
+ value = "<em>None</em>"
return value
17 years, 8 months
rhmessaging commits: r2396 - mgmt/trunk/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-09-03 15:49:09 -0400 (Wed, 03 Sep 2008)
New Revision: 2396
Modified:
mgmt/trunk/cumin/python/wooly/widgets.py
Log:
Revert to Justin's handling of property values.
Modified: mgmt/trunk/cumin/python/wooly/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/wooly/widgets.py 2008-09-03 19:17:41 UTC (rev 2395)
+++ mgmt/trunk/cumin/python/wooly/widgets.py 2008-09-03 19:49:09 UTC (rev 2396)
@@ -416,11 +416,13 @@
return escape_amp(prop[0])
def render_value(self, session, prop):
- # we can't escape all entities here since
- # values that contained html tags would get
- # displayed improperly
- return escape_amp(prop[1])
+ value = prop[1]
+ if type(value) is str:
+ value = escape(value)
+
+ return value
+
class ActionSet(RenderingItemSet):
def __init__(self, app, name, item_renderer=None):
super(ActionSet, self).__init__(app, name, item_renderer)
17 years, 8 months