resource-agents: master - Revert "config: Add missing resource docs to cluster.rng"

Marek Grác marx at fedoraproject.org
Sat Oct 16 13:54:46 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=af935e2b21c063bbe99bd681dcf72fc3576da8d0
Commit:        af935e2b21c063bbe99bd681dcf72fc3576da8d0
Parent:        67af1862e180e340b2f4efced99f85c880b3281a
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Sat Oct 16 15:39:57 2010 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Sat Oct 16 15:39:57 2010 +0200

Revert "config: Add missing resource docs to cluster.rng"

This reverts commit 64c6eca0cecb66050ad614236535ee9ca1fa7eff.
---
 rgmanager/src/resources/ra2rng.xsl         |   17 ++++---
 rgmanager/src/resources/resources.rng.tail |   10 ++--
 rgmanager/src/resources/service.sh         |   52 +++++++++++++--------
 rgmanager/src/resources/vm.sh              |   70 ++++++++++++++-------------
 4 files changed, 83 insertions(+), 66 deletions(-)

diff --git a/rgmanager/src/resources/ra2rng.xsl b/rgmanager/src/resources/ra2rng.xsl
index 11782d7..29b400f 100644
--- a/rgmanager/src/resources/ra2rng.xsl
+++ b/rgmanager/src/resources/ra2rng.xsl
@@ -8,35 +8,36 @@
 
 <xsl:template match="/resource-agent">
   &lt;define name="<xsl:call-template name="capitalize"><xsl:with-param name="value" select="@name"/></xsl:call-template>"&gt;
-    &lt;element name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>"&gt;
+    &lt;element name="<xsl:value-of select="@name"/>"&gt;
+      &lt;!-- <xsl:value-of select="normalize-space(shortdesc)"/> --&gt;
       &lt;choice&gt;
       &lt;group&gt;
         &lt;!-- rgmanager specific stuff --&gt;
-        &lt;attribute name="ref" rha:description="Reference to existing <xsl:value-of select="@name"/> resource in the resources section."/&gt;
+        &lt;attribute name="ref"/&gt;
       &lt;/group&gt;
       &lt;group&gt;<xsl:for-each select="parameters/parameter">
 		<xsl:choose>
 			<xsl:when test="@required = 1 or @primary = 1">
-        &lt;attribute name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>"/&gt;</xsl:when>
+        &lt;attribute name="<xsl:value-of select="@name"/>"/&gt;</xsl:when>
 			<xsl:otherwise>
         &lt;optional&gt;
-          &lt;attribute name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>"/&gt;
+          &lt;attribute name="<xsl:value-of select="@name"/>"/&gt;
         &lt;/optional&gt;</xsl:otherwise>
 		</xsl:choose>
 	</xsl:for-each>
       &lt;/group&gt;
       &lt;/choice&gt;
       &lt;optional&gt;
-        &lt;attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/&gt;
+        &lt;attribute name="__independent_subtree"/&gt;
       &lt;/optional&gt;
       &lt;optional&gt;
-        &lt;attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/&gt;
+        &lt;attribute name="__enforce_timeouts"/&gt;
       &lt;/optional&gt;
       &lt;optional&gt;
-        &lt;attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/&gt;
+        &lt;attribute name="__max_failures"/&gt;
       &lt;/optional&gt;
       &lt;optional&gt;
-        &lt;attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/&gt;
+        &lt;attribute name="__failure_expire_time"/&gt;
       &lt;/optional&gt;
       &lt;optional&gt;
         &lt;attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/&gt;
diff --git a/rgmanager/src/resources/resources.rng.tail b/rgmanager/src/resources/resources.rng.tail
index 765c2d9..c273680 100644
--- a/rgmanager/src/resources/resources.rng.tail
+++ b/rgmanager/src/resources/resources.rng.tail
@@ -14,16 +14,16 @@
 
   <define name="RESOURCEACTION">
    <zeroOrMore>
-    <element name="action" rha:description="Overrides resource action timings for a resource instance.">
-     <attribute name="name" rha:description="Name of resource action (start, stop, status, etc.)."/>
+    <element name="action">
+     <attribute name="name"/>
      <optional>
-      <attribute name="depth" rha:description="Status check depth (resource agent dependent; * = all depths)."/>
+      <attribute name="depth"/>
      </optional>
      <optional>
-      <attribute name="interval" rha:description="Status check interval."/>
+      <attribute name="interval"/>
      </optional>
      <optional>
-      <attribute name="timeout" rha:description="Action timeout.  Meaningless unless __enforce_timeouts is set for this resource."/>
+      <attribute name="timeout"/>
      </optional>
     </element>
    </zeroOrMore>
diff --git a/rgmanager/src/resources/service.sh b/rgmanager/src/resources/service.sh
index e37f518..5adcc37 100644
--- a/rgmanager/src/resources/service.sh
+++ b/rgmanager/src/resources/service.sh
@@ -23,7 +23,7 @@ meta_data()
         group or cluster service.
     </longdesc>
     <shortdesc lang="en">
-        Defines a service (resource group).
+        Defines a services.
     </shortdesc>
 
     <parameters>
@@ -32,18 +32,18 @@ meta_data()
                 This is the name of the resource group.
             </longdesc>
             <shortdesc lang="en">
-                Name.
+                Name
             </shortdesc>
             <content type="string"/>
         </parameter>
     
         <parameter name="domain" reconfig="1">
             <longdesc lang="en">
-                Failover domains define lists of cluster members
+                Fail over domains define lists of cluster members
                 to try in the event that a resource group fails.
             </longdesc>
             <shortdesc lang="en">
-                Failover domain.
+                Fail over Domain
             </shortdesc>
             <content type="string"/>
         </parameter>
@@ -61,6 +61,21 @@ meta_data()
             <content type="boolean" default="1"/>
         </parameter>
 
+        <parameter name="hardrecovery" reconfig="1">
+            <longdesc lang="en">
+	    	If set to yes, the last owner will reboot if this resource
+		group fails to stop cleanly, thus allowing the resource
+		group to fail over to another node.  Use with caution; a
+		badly-behaved resource could cause the entire cluster to
+		reboot.  This should never be enabled if the automatic
+		start feature is used.
+            </longdesc>
+            <shortdesc lang="en">
+	    	Reboot if stop phase fails
+            </shortdesc>
+            <content type="boolean" default="0"/>
+        </parameter>
+
         <parameter name="exclusive" reconfig="1">
             <longdesc lang="en">
 	    	If set, this resource group will only relocate to
@@ -73,7 +88,7 @@ meta_data()
 		operations.
             </longdesc>
             <shortdesc lang="en">
-	        Exclusive service.
+	        Exclusive resource group
             </shortdesc>
             <content type="boolean" default="0"/>
         </parameter>
@@ -89,7 +104,7 @@ meta_data()
 		the -H parameter.
 	    </longdesc>
 	    <shortdesc lang="en">
-	        Enable NFS lock workarounds.
+	        Enable NFS lock workarounds
 	    </shortdesc>
 	    <content type="boolean" default="0"/>
 	</parameter>
@@ -109,7 +124,7 @@ meta_data()
 		is called.
             </longdesc>
             <shortdesc lang="en">
-	    	Enable exportfs list caching (performance).
+	    	Enable exportfs list caching
             </shortdesc>
 	    <content type="integer" default="0"/>
 	</parameter>
@@ -126,33 +141,33 @@ meta_data()
 		recovered without a restart will be.
             </longdesc>
             <shortdesc lang="en">
-	    	Failure recovery policy (restart, relocate, or disable).
+	    	Failure recovery policy
             </shortdesc>
             <content type="string" default="restart"/>
         </parameter>
 
         <parameter name="depend">
             <longdesc lang="en">
-		Service dependency; will not start without the specified
-		service running.
+		Top-level service this depends on, in "service:name" format.
             </longdesc>
             <shortdesc lang="en">
-		Top-level service this depends on, in service:name format.
+		Service dependency; will not start without the specified
+		service running.
             </shortdesc>
             <content type="string"/>
         </parameter>
 
         <parameter name="depend_mode">
             <longdesc lang="en">
+	    	Dependency mode
+            </longdesc>
+            <shortdesc lang="en">
 		Service dependency mode.
 		hard - This service is stopped/started if its dependency
 		       is stopped/started
 		soft - This service only depends on the other service for
 		       initial startip.  If the other service stops, this
 		       service is not stopped.
-            </longdesc>
-            <shortdesc lang="en">
-	    	Service dependency mode (soft or hard).
             </shortdesc>
             <content type="string" default="hard"/>
         </parameter>
@@ -169,16 +184,15 @@ meta_data()
 
         <parameter name="restart_expire_time">
             <longdesc lang="en">
+	    	Restart expiration time
+            </longdesc>
+            <shortdesc lang="en">
 	    	Restart expiration time.  A restart is forgotten
 		after this time.  When combined with the max_restarts
 		option, this lets administrators specify a threshold
 		for when to fail over services.  If max_restarts
 		is exceeded in this given expiration time, the service
 		is relocated instead of restarted again.
-            </longdesc>
-            <shortdesc lang="en">
-	    	Restart expiration time; amount of time before a restart
-		is forgotten.
             </shortdesc>
             <content type="string" default="0"/>
         </parameter>
@@ -193,7 +207,7 @@ meta_data()
 		on.
 	    </longdesc>
 	    <shortdesc lang="en">
-		Service priority.
+		Service priority
 	    </shortdesc>
 	    <content type="integer" default="0"/>
 	</parameter>
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index e23d5ba..1fa74a4 100644
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -40,12 +40,12 @@ meta_data()
     
         <parameter name="domain" reconfig="1">
             <longdesc lang="en">
-                Failover domains define lists of cluster members
+                Fail over domains define lists of cluster members
                 to try in the event that the host of the virtual machine
 		fails.
             </longdesc>
             <shortdesc lang="en">
-                Cluster failover Domain
+                Cluster Fail Over Domain
             </shortdesc>
             <content type="string"/>
         </parameter>
@@ -63,6 +63,21 @@ meta_data()
             <content type="boolean" default="1"/>
         </parameter>
 
+        <parameter name="hardrecovery" reconfig="1">
+            <longdesc lang="en">
+	    	If set to yes, the last owner will reboot if this resource
+		group fails to stop cleanly, thus allowing the resource
+		group to fail over to another node.  Use with caution; a
+		badly-behaved resource could cause the entire cluster to
+		reboot.  This should never be enabled if the automatic
+		start feature is used.
+            </longdesc>
+            <shortdesc lang="en">
+	    	Reboot if stop phase fails
+            </shortdesc>
+            <content type="boolean" default="0"/>
+        </parameter>
+
         <parameter name="exclusive" reconfig="1">
             <longdesc lang="en">
 	    	If set, this resource group will only relocate to
@@ -106,7 +121,7 @@ meta_data()
 
 	<parameter name="use_virsh">
 	    <longdesc lang="en">
-	    	Force use of virsh instead of xm on Xen machines.
+	    	Use virsh instead of XM
 	    </longdesc>
 	    <shortdesc lang="en">
 	    	If set to 1, vm.sh will use the virsh command to manage
@@ -118,31 +133,30 @@ meta_data()
 
 	<parameter name="xmlfile">
 	    <longdesc lang="en">
-	    	Full path to libvirt XML file describing the domain.
+	    	Use xmlfile to create the vm (libvirt)
 	    </longdesc>
 	    <shortdesc lang="en">
-	    	Full path to libvirt XML file describing the domain.
 	    </shortdesc>
             <content type="string"/>
 	</parameter>
 
 	<parameter name="migrate">
 	    <longdesc lang="en">
-	    	Migration type (live or pause, default = live).
+	    	Migration type live or pause, default = live.
 	    </longdesc>
 	    <shortdesc lang="en">
-	    	Migration type (live or pause, default = live).
+	    	Migration type live or pause, default = live.
 	    </shortdesc>
             <content type="string" default="live"/>
         </parameter>
 
 	<parameter name="path">
 	    <longdesc lang="en">
-		Path specification vm.sh will search for the specified
- 		VM configuration file.  /path1:/path2:...
+		Path specification 'xm create' will search for the specified
+ 		VM configuration file
 	    </longdesc>
 	    <shortdesc lang="en">
-		Path to virtual machine configuration files.
+		Path to virtual machine configuration files
  	    </shortdesc>
 	    <content type="string"/>
  	</parameter>
@@ -161,26 +175,26 @@ meta_data()
 
         <parameter name="depend">
             <longdesc lang="en">
-		Service dependency; will not start without the specified
-		service running.
+		Top-level service this depends on, in "service:name" format.
             </longdesc>
             <shortdesc lang="en">
-		Top-level service this depends on, in service:name format.
+		Service dependency; will not start without the specified
+		service running.
             </shortdesc>
             <content type="string"/>
         </parameter>
 
         <parameter name="depend_mode">
             <longdesc lang="en">
+	    	Dependency mode
+            </longdesc>
+            <shortdesc lang="en">
 		Service dependency mode.
 		hard - This service is stopped/started if its dependency
 		       is stopped/started
 		soft - This service only depends on the other service for
 		       initial startip.  If the other service stops, this
 		       service is not stopped.
-            </longdesc>
-            <shortdesc lang="en">
-	    	Service dependency mode (soft or hard).
             </shortdesc>
             <content type="string" default="hard"/>
         </parameter>
@@ -196,18 +210,6 @@ meta_data()
         </parameter>
 
         <parameter name="restart_expire_time" reconfig="1">
-            <longdesc lang="en">
-	    	Restart expiration time.  A restart is forgotten
-		after this time.  When combined with the max_restarts
-		option, this lets administrators specify a threshold
-		for when to fail over services.  If max_restarts
-		is exceeded in this given expiration time, the service
-		is relocated instead of restarted again.
-            </longdesc>
-            <shortdesc lang="en">
-	    	Restart expiration time; amount of time before a restart
-		is forgotten.
-            </shortdesc>
             <content type="string" default="0"/>
         </parameter>
 
@@ -237,24 +239,24 @@ meta_data()
 	</parameter>
 
 	<parameter name="hypervisor_uri">
+            <shortdesc lang="en">
+		Hypervisor URI
+            </shortdesc >
             <longdesc lang="en">
 		Hypervisor URI.  Generally, this is keyed off of the
 		hypervisor and does not need to be set.
             </longdesc>
-            <shortdesc lang="en">
-		Hypervisor URI (normally automatic).
-            </shortdesc >
 	    <content type="string" default="auto" />
 	</parameter>
 
 	<parameter name="migration_uri">
+            <shortdesc lang="en">
+		Migration URI
+            </shortdesc >
             <longdesc lang="en">
 		Migration URI.  Generally, this is keyed off of the
 		hypervisor and does not need to be set.
             </longdesc>
-            <shortdesc lang="en">
-		Migration URI (normally automatic).
-            </shortdesc >
 	    <content type="string" default="auto" />
 	</parameter>
 


More information about the cluster-commits mailing list