Author: eallen Date: 2011-03-09 15:42:08 +0000 (Wed, 09 Mar 2011) New Revision: 4591
Modified: trunk/cumin/model/condor.xml Log: Latest condor.xml with cumin specific "optional=y" changes applied
Modified: trunk/cumin/model/condor.xml =================================================================== --- trunk/cumin/model/condor.xml 2011-03-09 15:11:34 UTC (rev 4590) +++ trunk/cumin/model/condor.xml 2011-03-09 15:42:08 UTC (rev 4591) @@ -2,7 +2,7 @@
<!-- /* - * Copyright 2008 Red Hat, Inc. + * Copyright 2000-2011 Red Hat, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,20 +32,18 @@ </group>
<group name="DaemonStatistics"> - <statistic name="MonitorSelfAge" type="uint32" optional="y"/> - <statistic name="MonitorSelfCPUUsage" type="double" optional="y"/> - - <statistic name="MonitorSelfImageSize" type="double" unit="KiB" optional="y"/> - <statistic name="MonitorSelfRegisteredSocketCount" type="uint32" optional="y"/> - <statistic name="MonitorSelfResidentSetSize" type="uint32" unit="KiB" optional="y"/> - <statistic name="MonitorSelfTime" type="absTime" optional="y"/> + <statistic name="MonitorSelfAge" type="uint32"/> + <statistic name="MonitorSelfCPUUsage" type="double"/> + <statistic name="MonitorSelfImageSize" type="double" unit="KiB"/> + <statistic name="MonitorSelfRegisteredSocketCount" type="uint32"/> + <statistic name="MonitorSelfResidentSetSize" type="uint32" unit="KiB"/> + <statistic name="MonitorSelfTime" type="absTime" unit="nanosecond"/> </group>
<group name="GridMethods"> <!-- quick test method across agents/objects --> <method name="echo"> <arg name="sequence" dir="IO" type="uint32"/> - <arg name="body" dir="IO" type="lstr"/> </method>
@@ -129,7 +127,6 @@ type="uint32" desc="Day of the week: 0 = Sunday, 1 = Monday, ..., 6 = Saturaday"/> - <statistic name="ClockMin" type="uint32" unit="minute" desc="Number of elapsed minutes since midnight"/> @@ -166,7 +163,6 @@ type="absTime" unit="nanosecond" desc="Time at which current State was entered, number of seconds since Unix epoch"/> - <property name="FileSystemDomain" type="sstr" desc="Configured namespace shared by slots with @@ -213,12 +209,12 @@ desc="Number of nanoseconds since epoch when the last benchmark was run" optional="y"/> - <property name="LastFetchWorkCompleted" type="absTime" unit="nanosecond" desc="Number of nanoseconds since epoch when the FetchWork Hook returned" optional="y"/> + <property name="LastFetchWorkSpawned" type="absTime" unit="nanosecond" desc="Number of nanoseconds since epoch when the @@ -250,7 +246,6 @@ type="uint32" desc="Relative integer performance on a Dhrystone benchmark"/> - <property name="MyAddress" type="sstr" desc="IP:Port of StartD in charge of the slot"/> @@ -304,7 +299,6 @@ preempting, job, calculated as Rank expression evaluated in context of the incoming job's ad, only present when slot is claimed"/> - <property name="RemoteOwner" type="sstr" optional="y" @@ -350,7 +344,6 @@ type="uint32" unit="second" desc="Number of second until StartD managing the slot has until it will exit"/> - <property name="TotalClaimRunTime" type="uint32" unit="second" optional="y" @@ -393,7 +386,6 @@ <property name="TotalMemory" type="uint32" unit="MiB" desc="Total RAM available on slot's machine, in MiB"/> - <property name="TotalSlots" type="uint32" desc="Total number of slots sharing the Machine"/> @@ -437,7 +429,6 @@ desc="Accumulated number of seconds the slot has been in State=Matched and Activity=Idle since the Startd started"/> - <statistic name="TotalTimeOwnerIdle" type="uint32" unit="second" desc="Accumulated number of seconds the slot has been @@ -481,7 +472,6 @@ representing a build number for a Windows operating system, only present on Windows slots"/> - <property name="WindowsMajorVersion" type="uint32" desc="Integer extracted from the platform type, @@ -502,7 +492,6 @@ <group name="GridMethods"/>
<property name="Pool" type="sstr" index="y"/> - <property name="System" type="sstr" index="y"/>
<property name="JobQueueBirthdate" type="absTime" optional="y"/> @@ -512,7 +501,6 @@ <statistic name="NumUsers" type="uint32"/> <property name="Name" type="sstr" index="y" desc=""/> <statistic name="TotalHeldJobs" type="uint32"/> - <statistic name="TotalIdleJobs" type="uint32"/> <statistic name="TotalJobAds" type="uint32"/> <statistic name="TotalRemovedJobs" type="uint32"/> @@ -524,7 +512,6 @@ </method>
<method name="SetJobAttribute"> - <arg name="Id" dir="I" type="sstr" desc="Job's Id, the string ClusterId.ProcId"/> <arg name="Name" dir="I" type="sstr"/> @@ -560,7 +547,6 @@ <statistic name="HeldJobs" type="uint32"/> <statistic name="IdleJobs" type="uint32"/> <property name="JobQueueBirthdate" type="absTime"/> - <property name="Machine" type="sstr"/> <property name="Name" type="sstr" index="y"/> <property name="Owner" type="sstr" desc="Match for same Submission field"/> @@ -570,7 +556,6 @@
<class name="Negotiator"> <property name="Pool" type="sstr" index="y"/> - <property name="System" type="sstr" index="y"/>
<property name="Name" type="sstr" index="y"/> @@ -582,30 +567,6 @@ <group name="DaemonStatistics"/> <group name="GridMethods"/>
- <statistic name="MatchRateSustained" type="uint32" desc="Matcher per second, since end of previous cycle" optional="y"/> - <statistic name="MatchRate" type="uint32" desc="Matches per second over current cycle" optional="y"/> - <statistic name="Matches" type="uint32" desc="Number of matches generated" optional="y"/> - <statistic name="Duration" type="uint32" desc="Negotiation cycle duration, in seconds" optional="y"/> - <statistic name="Phase1Duration" type="uint32" desc="Duration of phase 1, in seconds" optional="y"/> - <statistic name="Phase2Duration" type="uint32" desc="Duration of phase 2, in seconds" optional="y"/> - <statistic name="Phase3Duration" type="uint32" desc="Duration of phase 3, in seconds" optional="y"/> - <statistic name="Phase4Duration" type="uint32" desc="Duration of phase 4, in seconds" optional="y"/> - <statistic name="SlotShareIter" type="uint32" desc="Number of share iterations" optional="y"/> - <statistic name="NumSchedulers" type="uint32" desc="Number of submitters" optional="y"/> - <statistic name="ActiveSubmitterCount" type="uint32" desc="Number of submitters with jobs" optional="y"/> - <statistic name="SubmittersFailed" type="lstr" desc="List of submitters that encountered a failure" optional="y"/> - <statistic name="SubmittersOutOfTime" type="lstr" desc="List of submitters that hit their match time limit" optional="y"/> - <statistic name="SubmittersShareLimit" type="lstr" desc="List of submitters that hit their share limit" optional="y"/> - <statistic name="NumIdleJobs" type="uint32" desc="Number of idle jobs" optional="y"/> - <statistic name="NumJobsConsidered" type="uint32" desc="Number of jobs that were considered for matching" optional="y"/> - <statistic name="Rejections" type="uint32" desc="Number of rejections" optional="y"/> - <statistic name="TotalSlots" type="uint32" desc="Number of slots found" optional="y"/> - <statistic name="TrimmedSlots" type="uint32" desc="Number of slots after trimming claimed slots" optional="y"/> - <statistic name="CandidateSlots" type="uint32" desc="Number of slots considered for matching" optional="y"/> - <statistic name="Time" type="uint32" desc="Start of cycle, seconds since Epoch" optional="y"/> - <statistic name="End" type="uint32" desc="End of cycle, seconds since Epoch" optional="y"/> - <statistic name="Period" type="uint32" desc="Time from end of previous cycle to end of current cycle" optional="y"/> - <method name="GetLimits"> <arg name="Limits" dir="O" type="map"/> </method> @@ -646,6 +607,30 @@ </method>
<method name="Reconfig"/> + + <statistic name="MatchRate" type="double" desc="Matches per second over current cycle"/> + <statistic name="MatchRateSustained" type="double" desc="Matcher per second, since end of previous cycle"/> + <statistic name="Matches" type="uint32" desc="Number of matches generated"/> + <statistic name="Duration" type="uint32" unit="second" desc="Negotiation cycle duration"/> + <statistic name="Phase1Duration" type="uint32" unit="second" desc="Duration of phase 1"/> + <statistic name="Phase2Duration" type="uint32" unit="second" desc="Duration of phase 2"/> + <statistic name="Phase3Duration" type="uint32" unit="second" desc="Duration of phase 3"/> + <statistic name="Phase4Duration" type="uint32" unit="second" desc="Duration of phase 4"/> + <statistic name="SlotShareIter" type="uint32" desc="Number of share iterations"/> + <statistic name="NumSchedulers" type="uint32" desc="Number of submitters"/> + <statistic name="ActiveSubmitterCount" type="uint32" desc="Number of submitters with jobs"/> + <statistic name="SubmittersFailed" type="lstr" desc="List of submitters that encountered a failure"/> + <statistic name="SubmittersOutOfTime" type="lstr" desc="List of submitters that hit their match time limit"/> + <statistic name="SubmittersShareLimit" type="lstr" desc="List of submitters that hit their share limit"/> + <statistic name="NumIdleJobs" type="uint32" desc="Number of idle jobs"/> + <statistic name="NumJobsConsidered" type="uint32" desc="Number of jobs that were considered for matching"/> + <statistic name="Rejections" type="uint32" desc="Number of rejections"/> + <statistic name="TotalSlots" type="uint32" desc="Number of slots found"/> + <statistic name="CandidateSlots" type="uint32" desc="Number of slots considered"/> + <statistic name="TrimmedSlots" type="uint32" desc="Number of slots after trimming claimed slots"/> + <statistic name="Time" type="absTime" unit="nanosecond" desc="Start of cycle, since Epoch"/> + <statistic name="End" type="absTime" unit="nanosecond" desc="End of cycle, since Epoch"/> + <statistic name="Period" type="uint32" unit="second" desc="Time from end of previous cycle to end of current cycle"/> </class>
<class name="Collector"> @@ -668,7 +653,6 @@ <statistic name="HostsClaimed" type="uint32"/> <statistic name="HostsUnclaimed" type="uint32"/> <statistic name="HostsOwner" type="uint32"/> - </class>
<class name="Master"> @@ -706,7 +690,6 @@
<property name="Pool" type="sstr" index="y"/> <property name="Name" type="sstr"/> - <property name="ScheddName" type="sstr"/> <property name="Owner" type="sstr"/>
@@ -727,7 +710,6 @@ <statistic name="NumJobs" type="uint32"/> <statistic name="SubmitsInProgress" type="uint32"/> <statistic name="SubmitsQueued" type="uint32"/> - <statistic name="SubmitsAllowed" type="uint32"/> <statistic name="SubmitsWanted" type="uint32"/> <statistic name="RunningJobs" type="uint32"/> @@ -739,7 +721,6 @@ <class name="JobServer">
<group name="DaemonProperties"/> - <group name="DaemonStatistics"/> <group name="GridMethods"/>
@@ -751,7 +732,6 @@ <property name="Machine" type="sstr" desc=""/> <property name="MyAddress" type="sstr" desc=""/> <property name="Name" type="sstr" index="y" desc=""/> - <property name="PublicNetworkIpAddr" type="sstr" desc=""/>
<method name="GetJobAd"> @@ -767,7 +747,6 @@ <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"/> @@ -779,7 +758,6 @@ <class name="Submission">
<group name="GridMethods"/> -
<!-- navigate from a submission to a job server to get its pool --> <property name="jobserverRef" type="objId" parentRef="y" index="y" references="com.redhat.grid:JobServer"/> @@ -791,12 +769,11 @@ <statistic name="Running" type="count32"/> <statistic name="Removed" type="count32"/> <statistic name="Completed" type="count32"/> - <statistic name="Held" type="count32"/>
<!-- summary info --> <method name="GetJobSummaries"> - <arg name="Jobs" dir="O" type="map"/> + <arg name="Jobs" dir="O" type="list"/> </method>
</class>