10:05 a.m.
Author: justi9
Date: 2010-02-05 11:05:34 -0500 (Fri, 05 Feb 2010)
New Revision: 3843
Modified:
mgmt/trunk/rosemary/Makefile
mgmt/trunk/rosemary/bin/rosemary-test
mgmt/trunk/rosemary/python/rosemary/model.py
mgmt/trunk/rosemary/python/rosemary/util.py
mgmt/trunk/rosemary/xml/Makefile
mgmt/trunk/rosemary/xml/condor.xml
mgmt/trunk/rosemary/xml/qpid.xml
Log:
Fix imports; update schema xml
Modified: mgmt/trunk/rosemary/Makefile
===================================================================
--- mgmt/trunk/rosemary/Makefile 2010-02-05 15:53:42 UTC (rev 3842)
+++ mgmt/trunk/rosemary/Makefile 2010-02-05 16:05:34 UTC (rev 3843)
@@ -1,4 +1,4 @@
-.PHONY: build install schema clean
+.PHONY: build install clean schema schema-clean
include ../etc/Makefile.common
@@ -24,12 +24,10 @@
install -d ${etc}
install -pm 0644 etc/* ${etc}
-schema:
+schema: schema-clean
$(MAKE) schema -C xml
- $(MAKE) schema -C python/rosemary
- $(MAKE) schema -C sql
-clean:
+schema-clean:
$(MAKE) clean -C xml
- $(MAKE) clean -C python/rosemary
- $(MAKE) clean -C sql
+
+clean: clean-python-files
Modified: mgmt/trunk/rosemary/bin/rosemary-test
===================================================================
--- mgmt/trunk/rosemary/bin/rosemary-test 2010-02-05 15:53:42 UTC (rev 3842)
+++ mgmt/trunk/rosemary/bin/rosemary-test 2010-02-05 16:05:34 UTC (rev 3843)
@@ -1,7 +1,7 @@
#!/usr/bin/python
from rosemary.model import *
-from rosemary.sql import *
+from rosemary.sqloperation import *
def do_model(args):
for package in model.packages:
Modified: mgmt/trunk/rosemary/python/rosemary/model.py
===================================================================
--- mgmt/trunk/rosemary/python/rosemary/model.py 2010-02-05 15:53:42 UTC (rev 3842)
+++ mgmt/trunk/rosemary/python/rosemary/model.py 2010-02-05 16:05:34 UTC (rev 3843)
@@ -1,4 +1,4 @@
-from sql import *
+from sqloperation import *
from sqlmodel import *
from types import *
from util import *
Modified: mgmt/trunk/rosemary/python/rosemary/util.py
===================================================================
--- mgmt/trunk/rosemary/python/rosemary/util.py 2010-02-05 15:53:42 UTC (rev 3842)
+++ mgmt/trunk/rosemary/python/rosemary/util.py 2010-02-05 16:05:34 UTC (rev 3843)
@@ -6,22 +6,3 @@
from xml.etree.ElementTree import *
except ImportError:
from elementtree.ElementTree import *
-
-def unstudly(name):
- chars = list()
-
- curr = name[0]
- prev = None
-
- chars.append(curr.lower())
-
- for i in range(1, len(name)):
- prev = curr
- curr = name[i]
-
- if curr.isupper() and not prev.isupper():
- chars.append("_")
-
- chars.append(curr.lower())
-
- return "".join(chars)
Modified: mgmt/trunk/rosemary/xml/Makefile
===================================================================
--- mgmt/trunk/rosemary/xml/Makefile 2010-02-05 15:53:42 UTC (rev 3842)
+++ mgmt/trunk/rosemary/xml/Makefile 2010-02-05 16:05:34 UTC (rev 3843)
@@ -20,7 +20,7 @@
svn export
http://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/src/qpid/cluster/mana...
qpid-cluster.xml
condor.xml:
- wget
"http://git.et.redhat.com/?p=mrg-grid.git;a=blob_plain;f=src/management/condor-management-schema.xml;hb=refs/heads/V7.3-QMF-Plugins"
-O condor.xml
+ wget
"http://git.fedorahosted.org/git/grid.git?p=grid.git;a=blob_plain;f=src/management/condor-management-schema.xml;hb=V7_4-QMF-branch"
-O condor.xml
sesame.xml:
svn export
http://anonsvn.jboss.org/repos/rhmessaging/mgmt/trunk/sesame/cpp/src/qmfg...
sesame.xml
Modified: mgmt/trunk/rosemary/xml/condor.xml
===================================================================
--- mgmt/trunk/rosemary/xml/condor.xml 2010-02-05 15:53:42 UTC (rev 3842)
+++ mgmt/trunk/rosemary/xml/condor.xml 2010-02-05 16:05:34 UTC (rev 3843)
@@ -85,7 +85,7 @@
qualified with a UidDomain, UidDomain taken from
RemoteUser, only present when a job is
executing"/>
- <statistic name="Activity"
+ <property name="Activity"
type="sstr"
desc="One of: Idle, No job activity; Busy, Job is
running; Suspended, Job is suspended; Vacating,
@@ -133,7 +133,6 @@
<property name="Cpus"
type="uint32"
desc="Number of CPUs in slot"/>
- <!-- XXX: CurrentRank could quite possibly be a statistic -->
<property name="CurrentRank"
type="double"
optional="y"
@@ -143,11 +142,11 @@
<property name="Disk"
type="uint32" unit="KiB"
desc="Amount of disk space in KiB available in the slot"/>
- <statistic name="EnteredCurrentActivity"
+ <property name="EnteredCurrentActivity"
type="absTime" unit="nanosecond"
desc="Time at which current Activity was entered,
number of nanoseconds since Unix epoch"/>
- <statistic name="EnteredCurrentState"
+ <property name="EnteredCurrentState"
type="absTime" unit="nanosecond"
desc="Time at which current State was entered,
number of seconds since Unix epoch"/>
@@ -160,10 +159,8 @@
optional="y"
desc="The running job's GlobalJobId, only present when
a job is executing"/>
- <!-- XXX: ImageSize could quite possibly be a statistic -->
- <property name="ImageSize"
+ <statistic name="ImageSize"
type="uint32" unit="KiB"
- optional="y"
desc="Estimate of the memory image size, in KiB, of the
running job, only present when a job is
executing, pulled by STARTD_JOB_EXPRS"/>
@@ -173,8 +170,6 @@
checkpointed job can run on the slot, part of the
slot's Requirements along with the Start
expression"/>
- <!-- XXX: JobId could quite possibly be a statistic, snapshots
- would show use over time -->
<property name="JobId"
type="sstr"
optional="y"
@@ -196,20 +191,20 @@
type="uint32"
desc="Relative floating point performance on a Linpack
benchmark"/>
- <statistic name="LastBenchmark"
+ <property name="LastBenchmark"
type="absTime" unit="nanosecond"
desc="Number of nanoseconds since epoch when the last
benchmark was run"/>
- <statistic name="LastFetchWorkCompleted"
+ <property name="LastFetchWorkCompleted"
type="absTime" unit="nanosecond"
desc="Number of nanoseconds since epoch when the
FetchWork Hook returned"/>
- <statistic name="LastFetchWorkSpawned"
+ <property name="LastFetchWorkSpawned"
type="absTime" unit="nanosecond"
desc="Number of nanoseconds since epoch when the
FetchWork Hook was invoked"/>
- <statistic name="LastPeriodicCheckpoint"
+ <property name="LastPeriodicCheckpoint"
type="absTime" unit="nanosecond"
desc="The number of nanoseconds since epoch when the
job last performed a periodic checkpoint, only
@@ -258,7 +253,7 @@
index="y"
desc="Name of the slot, either the same as Machine,
slot#@Machine, or a configured value"/>
- <statistic name="NextFetchWorkDelay"
+ <property name="NextFetchWorkDelay"
type="int32" unit="second"
desc="Number of seconds until the next FetchWork
Hook will be invoked, -1 means never"/>
@@ -285,7 +280,6 @@
desc="The name of the user originally preempting the
current job, i.e. the incoming user, only present
when slot is claimed"/>
- <!-- XXX: PreemptingUser could quite possibly be a statistic -->
<property name="PreemptingUser"
type="sstr"
optional="y"
@@ -293,7 +287,6 @@
different from PreemptingOwner only if the claim
was given to another user who is using it to
preempt, only present when slot is claimed"/>
- <!-- XXX: PreemptingRank could quite possibly be a statistic -->
<property name="PreemptingRank"
type="double"
optional="y"
@@ -301,15 +294,11 @@
preempting, job, calculated as Rank expression
evaluated in context of the incoming job's ad,
only present when slot is claimed"/>
- <!-- XXX: RemoteOwner could quite possibly be a statistic, showing
- use over time -->
<property name="RemoteOwner"
type="sstr"
optional="y"
desc="The name of the user who originally claimed the
slot, only present when slot is claimed"/>
- <!-- XXX: RemoteUser could quite possibly be a statistic, showing
- use over time -->
<property name="RemoteUser"
type="sstr"
optional="y"
@@ -321,9 +310,6 @@
type="lstr"
desc="Expression evaluated in the context of a job ad
to determine if the slot will run a job"/>
- <property name="PublicNetworkIpAddr"
- type="sstr"
- desc="IP:Port used to communicate with the slot"/>
<property name="Rank"
type="lstr"
desc="Configured expression representing how the slot
@@ -341,7 +327,7 @@
slot has, i.e. HasFileTransfer,HasJava,HasVM,
query with stringListMember('Element',
StarterAbilityList)"/>
- <statistic name="State"
+ <property name="State"
type="sstr"
desc="One of: Owner, unavailable to Condor; Unclaimed,
available to Condor, but no job match yet;
@@ -354,18 +340,16 @@
type="sstr"
desc="Always 'Job'"/>
-->
- <statistic name="TimeToLive"
+ <property name="TimeToLive"
type="uint32" unit="second"
desc="Number of second until StartD managing the slot
has until it will exit"/>
- <!-- XXX: TotalClaimRunTime is a statistic -->
<property name="TotalClaimRunTime"
type="uint32" unit="second"
optional="y"
desc="Number of seconds the current claim has spent
running jobs, only present when slot is
claimed"/>
- <!-- XXX: TotalClaimSuspendTime is a statistic -->
<property name="TotalClaimSuspendTime"
type="uint32" unit="second"
optional="y"
@@ -384,14 +368,12 @@
type="uint32" unit="KiB"
desc="Amount of disk space available on the slot's host
machine"/>
- <!-- XXX: TotalJobRunTime is a statistic -->
<property name="TotalJobRunTime"
type="uint32" unit="second"
optional="y"
desc="Number of seconds the current job has spent
running, i.e. Claimed/Busy, only present when
slot is claimed"/>
- <!-- XXX: TotalJobSuspendTime is a statistic -->
<property name="TotalJobSuspendTime"
type="uint32" unit="second"
optional="y"
@@ -511,6 +493,7 @@
<!--
Exec Host, Order(Rank?), StartTime, TotalTime (Sys, User), Project, AccountingGroup
-->
+<!--
<class name="Job">
<property name="schedulerRef" type="objId"
parentRef="y" index="y"
references="mrg.grid.Scheduler"/>
<property name="submitterRef" type="objId"
references="mrg.grid.Submitter"/>
@@ -559,11 +542,11 @@
desc="The number of nanoseconds since epoch when the
job was submitted."/>
-<!--
- <property name="Requirements" type="lstr"
desc=""/>
- <property name="Scheduler" type="sstr" desc=""/>
--->
+// <property name="Requirements" type="lstr"
desc=""/>
+// <property name="Scheduler" type="sstr"
desc=""/>
+
+
<property name="JobUniverse"
type="uint32"
desc=""/>
@@ -617,6 +600,7 @@
<arg name="Data" dir="O" type="lstr"/>
</method>
</class>
+-->
<class name="Scheduler">
<group name="daemon-stats"/>
@@ -630,7 +614,6 @@
<property name="MyAddress" type="sstr" desc=""/>
<statistic name="NumUsers" type="uint32"/>
<property name="Name" type="sstr" index="y"
desc=""/>
- <property name="PublicNetworkIpAddr" type="sstr"
desc=""/>
<statistic name="TotalHeldJobs" type="uint32"/>
<statistic name="TotalIdleJobs" type="uint32"/>
<statistic name="TotalJobAds" type="uint32"/>
@@ -641,6 +624,65 @@
<arg name="Ad" dir="I" type="map"/>
<arg name="Id" dir="O" type="sstr"/>
</method>
+
+ <method name="GetAd">
+ <arg name="Id" dir="I" type="sstr"
+ desc="Job's Id, the string ClusterId.ProcId"/>
+ <arg name="JobAd" dir="O" type="map"
+ desc="(name,value,type) tuples; Values are INTEGER, FLOAT,
+ STRING and EXPR. The EXPR value is not first class,
+ it is an unquoted, with double quotes, string"/>
+ </method>
+
+ <method name="SetAttribute">
+ <arg name="Id" dir="I" type="sstr"
+ desc="Job's Id, the string ClusterId.ProcId"/>
+ <arg name="Name" dir="I" type="sstr"/>
+ <arg name="Value" dir="I" type="lstr"/>
+ </method>
+
+ <method name="Hold">
+ <arg name="Id" dir="I" type="sstr"
+ desc="Job's Id, the string ClusterId.ProcId"/>
+ <arg name="Reason" dir="I" type="sstr"/>
+ </method>
+
+ <method name="Release">
+ <arg name="Id" dir="I" type="sstr"
+ desc="Job's Id, the string ClusterId.ProcId"/>
+ <arg name="Reason" dir="I" type="sstr"/>
+ </method>
+
+ <method name="Remove">
+ <arg name="Id" dir="I" type="sstr"
+ desc="Job's Id, the string ClusterId.ProcId"/>
+ <arg name="Reason" dir="I" type="sstr"/>
+ </method>
+
+ <method name="Fetch">
+ <arg name="Id" dir="I" type="sstr"
+ desc="Job's Id, the string ClusterId.ProcId"/>
+ <arg name="File" dir="I" type="sstr"/>
+ <arg name="Start" dir="I" type="int32"/>
+ <arg name="End" dir="I" type="int32"/>
+ <arg name="Data" dir="O" type="lstr"/>
+ </method>
+
+ <method name="GetStates">
+ <arg name="Submission" dir="I" type="sstr"/>
+ <arg name="State" dir="I" type="uint32"/>
+ <arg name="Count" dir="O" type="uint32"/>
+ </method>
+
+ <method name="GetJobs">
+ <arg name="Submission" dir="I" type="sstr"/>
+ <arg name="Jobs" dir="O" type="map"/>
+ </method>
+
+ <method name="echo">
+ <arg name="sequence" dir="IO" type="uint32"/>
+ <arg name="body" dir="IO" type="lstr"/>
+ </method>
</class>
<class name="Submitter">
@@ -744,7 +786,7 @@
<property name="CondorPlatform" type="sstr"/>
<property name="CondorVersion" type="sstr"/>
<property name="Name" type="sstr" index="y"/>
- <property name="PublicNetworkIpAddr" type="sstr"/>
+ <property name="MyAddress" type="sstr"/>
<statistic name="RunningJobs" type="uint32"/>
<statistic name="IdleJobs" type="uint32"/>
@@ -763,7 +805,6 @@
<property name="Name" type="sstr" index="y"/>
<property name="Machine" type="sstr"/>
- <property name="PublicNetworkIpAddr" type="sstr"/>
<property name="MyAddress" type="sstr"/>
<property name="RealUid" type="int32"/>
@@ -813,4 +854,18 @@
<statistic name="RunningJobs" type="uint32"/>
<statistic name="IdleJobs" type="uint32"/>
</class>
+
+ <class name="Submission">
+ <property name="schedulerRef" type="objId"
parentRef="y" index="y"
references="mrg.grid.Scheduler"/>
+
+ <property name="Name" type="sstr" index="y"/>
+ <property name="Owner" type="sstr" index="y"/>
+
+ <statistic name="Idle" type="count32"/>
+ <statistic name="Running" type="count32"/>
+ <statistic name="Removed" type="count32"/>
+ <statistic name="Completed" type="count32"/>
+ <statistic name="Held" type="count32"/>
+ </class>
+
</schema>
Modified: mgmt/trunk/rosemary/xml/qpid.xml
===================================================================
--- mgmt/trunk/rosemary/xml/qpid.xml 2010-02-05 15:53:42 UTC (rev 3842)
+++ mgmt/trunk/rosemary/xml/qpid.xml 2010-02-05 16:05:34 UTC (rev 3843)
@@ -129,10 +129,11 @@
<property name="vhostRef" type="objId"
references="Vhost" access="RC" index="y"
parentRef="y"/>
<property name="name" type="sstr" access="RC"
index="y"/>
- <property name="durable" type="bool"
access="RC"/>
- <property name="autoDelete" type="bool"
access="RC"/>
- <property name="exclusive" type="bool"
access="RC"/>
- <property name="arguments" type="map" access="RO"
desc="Arguments supplied in queue.declare"/>
+ <property name="durable" type="bool"
access="RC"/>
+ <property name="autoDelete" type="bool"
access="RC"/>
+ <property name="exclusive" type="bool"
access="RC"/>
+ <property name="arguments" type="map"
access="RO" desc="Arguments supplied in queue.declare"/>
+ <property name="altExchange" type="objId"
references="Exchange" access="RO" optional="y"/>
<statistic name="msgTotalEnqueues" type="count64"
unit="message" desc="Total messages enqueued"/>
<statistic name="msgTotalDequeues" type="count64"
unit="message" desc="Total messages dequeued"/>
@@ -154,8 +155,14 @@
<statistic name="messageLatency" type="mmaTime"
unit="nanosecond" desc="Broker latency through this queue"/>
<method name="purge" desc="Discard all or some messages on a
queue">
- <arg name="request" dir="I" type="uint32"
desc="0 for all messages or n>0 for n messages"/>
+ <arg name="request" dir="I" type="uint32"
desc="0 for all messages or n>0 for n messages"/>
</method>
+
+ <method name="reroute" desc="Remove all or some messages on this
queue and route them to an exchange">
+ <arg name="request" dir="I" type="uint32"
desc="0 for all messages or n>0 for n messages"/>
+ <arg name="useAltExchange" dir="I" type="bool"
desc="Iff true, use the queue's configured alternate exchange; iff false, use
exchange named in the 'exchange' argument"/>
+ <arg name="exchange" dir="I" type="sstr"
desc="Name of the exchange to route the messages through"/>
+ </method>
</class>
<!--
@@ -164,11 +171,13 @@
===============================================================
-->
<class name="Exchange">
- <property name="vhostRef" type="objId"
references="Vhost" access="RC" index="y"
parentRef="y"/>
- <property name="name" type="sstr" access="RC"
index="y"/>
- <property name="type" type="sstr"
access="RO"/>
- <property name="durable" type="bool"
access="RC"/>
- <property name="arguments" type="map" access="RO"
desc="Arguments supplied in exchange.declare"/>
+ <property name="vhostRef" type="objId"
references="Vhost" access="RC" index="y"
parentRef="y"/>
+ <property name="name" type="sstr"
access="RC" index="y"/>
+ <property name="type" type="sstr"
access="RO"/>
+ <property name="durable" type="bool"
access="RO"/>
+ <property name="autoDelete" type="bool"
access="RO"/>
+ <property name="altExchange" type="objId"
references="Exchange" access="RO" optional="y"/>
+ <property name="arguments" type="map"
access="RO" desc="Arguments supplied in exchange.declare"/>
<statistic name="producerCount" type="hilo32"
desc="Current producers on exchange"/>
<statistic name="bindingCount" type="hilo32"
desc="Current bindings"/>
@@ -197,6 +206,23 @@
<!--
===============================================================
+ Subscription
+ ===============================================================
+ -->
+ <class name="Subscription">
+ <property name="sessionRef" type="objId"
references="Session" access="RC" index="y"
parentRef="y"/>
+ <property name="queueRef" type="objId"
references="Queue" access="RC" index="y"/>
+ <property name="name" type="sstr"
access="RC" index="y"/>
+ <property name="browsing" type="bool"
access="RC"/>
+ <property name="acknowledged" type="bool"
access="RC"/>
+ <property name="exclusive" type="bool"
access="RC"/>
+ <property name="creditMode" type="sstr"
access="RO" desc="WINDOW or CREDIT"/>
+ <property name="arguments" type="map"
access="RC"/>
+ <statistic name="delivered" type="count64"
unit="message" desc="Messages delivered"/>
+ </class>
+
+ <!--
+ ===============================================================
Connection
===============================================================
-->
@@ -306,6 +332,27 @@
<method name="close"/>
</class>
+ <!--
+ ===============================================================
+ ManagementSetupState
+ ===============================================================
+
+ This thing is used during cluster recovery operations (and maybe
+ eventually elsewhere) to transmit assorted state from one broker to
+ another. At present, the two data propagated are the object number
+ counter and boot sequence, both of which are used for creating
+ object ids for newly-created objects.
+
+ -->
+ <class name="ManagementSetupState">
+ <!-- for reasons that aren't clear (to me, anyhow) you have to say
+ access="RO" to get accessor methods defined. RC or RW don't do
+ it. Probably this is documented someplace, but I couldn't find
+ it. -jrd -->
+ <property name="objectNum" type="uint64"
access="RO"/>
+ <property name="bootSequence" type="uint16"
access="RO"/>
+ </class>
+
<eventArguments>
<arg name="altEx" type="sstr" desc="Name of the
alternate exchange"/>
<arg name="args" type="map" desc="Supplemental
arguments or parameters supplied"/>