Merge pull request #3968 from nrwahl2/nrwahl2-T1000

Deprecate some cluster options

Author: clumens

cts/cli/regression.cibadmin.exp

@@ -79,12 +79,12 @@
 =#=#=#= End test: Validate CIB (XML) - OK (0) =#=#=#=
 * Passed: cibadmin              - Validate CIB (XML)
 =#=#=#= Begin test: Digest calculation =#=#=#=
-c330f9df7e1e54e99f9d5ae1a0d8d59a
+02e4118f17d65a512f1f540ff30dc116
 =#=#=#= End test: Digest calculation - OK (0) =#=#=#=
 * Passed: cibadmin              - Digest calculation
 =#=#=#= Begin test: Digest calculation (XML) =#=#=#=
 <pacemaker-result api-version="X" request="cibadmin --output-as=xml -5 -p">
-  <md5-sum digest="c330f9df7e1e54e99f9d5ae1a0d8d59a"/>
+  <md5-sum digest="02e4118f17d65a512f1f540ff30dc116"/>
   <status code="0" message="OK"/>
 </pacemaker-result>
 =#=#=#= End test: Digest calculation (XML) - OK (0) =#=#=#=

cts/cli/regression.crm_attribute.exp

@@ -61,9 +61,6 @@ Also known as properties, these are options that affect behavior across the enti
     * When true, the cluster will immediately ban a resource from a node if it fails to start there. When false, the cluster will instead check the resource's fail count against its migration-threshold.
     * Possible values: boolean (default: )
 
-  * enable-startup-probes: Whether the cluster should check for active resources during start-up
-    * Possible values: boolean (default: )
-
   * fencing-action: Action to send to fence device when a node needs to be fenced
     * Possible values: "reboot" (default), "off"
 
@@ -111,19 +108,9 @@ Also known as properties, these are options that affect behavior across the enti
   * migration-limit: The number of live migration actions that the cluster is allowed to execute in parallel on a node (-1 means no limit)
     * Possible values: integer (default: )
 
-  * cluster-ipc-limit: Maximum IPC message backlog before disconnecting a client
-    * Raise this if log has "Evicting client" messages for cluster PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).
-    * Possible values: nonnegative_integer (default: )
-
   * stop-all-resources: Whether the cluster should stop all active resources
     * Possible values: boolean (default: )
 
-  * stop-removed-resources: Whether to stop resources that were removed from the configuration
-    * Possible values: boolean (default: )
-
-  * stop-removed-actions: Whether to cancel recurring actions removed from the configuration
-    * Possible values: boolean (default: )
-
   * pe-error-series-max: The number of scheduler inputs resulting in errors to save
     * Zero to disable, -1 to store unlimited.
     * Possible values: integer (default: )
@@ -260,6 +247,7 @@ Also known as properties, these are options that affect behavior across the enti
         <content type="boolean" default=""/>
       </parameter>
       <parameter name="enable-startup-probes" advanced="0" generated="0">
+        <deprecated/>
         <longdesc lang="en">Whether the cluster should check for active resources during start-up</longdesc>
         <shortdesc lang="en">Whether the cluster should check for active resources during start-up</shortdesc>
         <content type="boolean" default=""/>
@@ -411,16 +399,18 @@ Also known as properties, these are options that affect behavior across the enti
         <content type="integer" default=""/>
       </parameter>
       <parameter name="cluster-ipc-limit" advanced="0" generated="0">
-        <longdesc lang="en">Raise this if log has "Evicting client" messages for cluster PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).</longdesc>
-        <shortdesc lang="en">Maximum IPC message backlog before disconnecting a client</shortdesc>
-        <content type="nonnegative_integer" default=""/>
+        <deprecated/>
+        <longdesc lang="en">Ignored</longdesc>
+        <shortdesc lang="en">Ignored</shortdesc>
+        <content type="nonnegative_integer"/>
       </parameter>
       <parameter name="stop-all-resources" advanced="0" generated="0">
         <longdesc lang="en">Whether the cluster should stop all active resources</longdesc>
         <shortdesc lang="en">Whether the cluster should stop all active resources</shortdesc>
         <content type="boolean" default=""/>
       </parameter>
       <parameter name="stop-removed-resources" advanced="0" generated="0">
+        <deprecated/>
         <longdesc lang="en">Whether to stop resources that were removed from the configuration</longdesc>
         <shortdesc lang="en">Whether to stop resources that were removed from the configuration</shortdesc>
         <content type="boolean" default=""/>
@@ -433,17 +423,18 @@ Also known as properties, these are options that affect behavior across the enti
         <shortdesc lang="en">Deprecated alias for stop-removed-resources</shortdesc>
         <content type="boolean" default=""/>
       </parameter>
-      <parameter name="stop-removed-actions" advanced="0" generated="0">
+      <parameter name="cancel-removed-actions" advanced="0" generated="0">
+        <deprecated/>
         <longdesc lang="en">Whether to cancel recurring actions removed from the configuration</longdesc>
         <shortdesc lang="en">Whether to cancel recurring actions removed from the configuration</shortdesc>
         <content type="boolean" default=""/>
       </parameter>
       <parameter name="stop-orphan-actions" advanced="0" generated="0">
         <deprecated>
-          <replaced-with name="stop-removed-actions"/>
+          <replaced-with name="cancel-removed-actions"/>
         </deprecated>
-        <longdesc lang="en">Deprecated alias for stop-removed-actions</longdesc>
-        <shortdesc lang="en">Deprecated alias for stop-removed-actions</shortdesc>
+        <longdesc lang="en">Deprecated alias for cancel-removed-actions</longdesc>
+        <shortdesc lang="en">Deprecated alias for cancel-removed-actions</shortdesc>
         <content type="boolean" default=""/>
       </parameter>
       <parameter name="pe-error-series-max" advanced="0" generated="0">
@@ -557,9 +548,6 @@ Also known as properties, these are options that affect behavior across the enti
     * When true, the cluster will immediately ban a resource from a node if it fails to start there. When false, the cluster will instead check the resource's fail count against its migration-threshold.
     * Possible values: boolean (default: )
 
-  * enable-startup-probes: Whether the cluster should check for active resources during start-up
-    * Possible values: boolean (default: )
-
   * fencing-action: Action to send to fence device when a node needs to be fenced
     * Possible values: "reboot" (default), "off"
 
@@ -607,19 +595,9 @@ Also known as properties, these are options that affect behavior across the enti
   * migration-limit: The number of live migration actions that the cluster is allowed to execute in parallel on a node (-1 means no limit)
     * Possible values: integer (default: )
 
-  * cluster-ipc-limit: Maximum IPC message backlog before disconnecting a client
-    * Raise this if log has "Evicting client" messages for cluster PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).
-    * Possible values: nonnegative_integer (default: )
-
   * stop-all-resources: Whether the cluster should stop all active resources
     * Possible values: boolean (default: )
 
-  * stop-removed-resources: Whether to stop resources that were removed from the configuration
-    * Possible values: boolean (default: )
-
-  * stop-removed-actions: Whether to cancel recurring actions removed from the configuration
-    * Possible values: boolean (default: )
-
   * pe-error-series-max: The number of scheduler inputs resulting in errors to save
     * Zero to disable, -1 to store unlimited.
     * Possible values: integer (default: )
@@ -687,9 +665,21 @@ Also known as properties, these are options that affect behavior across the enti
 
   * DEPRECATED OPTIONS (will be removed in a future release):
 
+    * enable-startup-probes: Whether the cluster should check for active resources during start-up
+      * Possible values: boolean (default: )
+
     * concurrent-fencing: Allow performing fencing operations in parallel
       * Possible values: boolean (default: )
 
+    * cluster-ipc-limit: Ignored
+      * Possible values: nonnegative_integer (no default)
+
+    * stop-removed-resources: Whether to stop resources that were removed from the configuration
+      * Possible values: boolean (default: )
+
+    * cancel-removed-actions: Whether to cancel recurring actions removed from the configuration
+      * Possible values: boolean (default: )
+
     * stonith-enabled: Deprecated alias for fencing-enabled
       * Possible values: boolean (default: )
 
@@ -711,7 +701,7 @@ Also known as properties, these are options that affect behavior across the enti
     * stop-orphan-resources: Deprecated alias for stop-removed-resources
       * Possible values: boolean (default: )
 
-    * stop-orphan-actions: Deprecated alias for stop-removed-actions
+    * stop-orphan-actions: Deprecated alias for cancel-removed-actions
       * Possible values: boolean (default: )
 =#=#=#= End test: List all available cluster options - OK (0) =#=#=#=
 * Passed: crm_attribute         - List all available cluster options
@@ -815,6 +805,7 @@ Also known as properties, these are options that affect behavior across the enti
         <content type="boolean" default=""/>
       </parameter>
       <parameter name="enable-startup-probes" advanced="0" generated="0">
+        <deprecated/>
         <longdesc lang="en">Whether the cluster should check for active resources during start-up</longdesc>
         <shortdesc lang="en">Whether the cluster should check for active resources during start-up</shortdesc>
         <content type="boolean" default=""/>
@@ -966,16 +957,18 @@ Also known as properties, these are options that affect behavior across the enti
         <content type="integer" default=""/>
       </parameter>
       <parameter name="cluster-ipc-limit" advanced="0" generated="0">
-        <longdesc lang="en">Raise this if log has "Evicting client" messages for cluster PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).</longdesc>
-        <shortdesc lang="en">Maximum IPC message backlog before disconnecting a client</shortdesc>
-        <content type="nonnegative_integer" default=""/>
+        <deprecated/>
+        <longdesc lang="en">Ignored</longdesc>
+        <shortdesc lang="en">Ignored</shortdesc>
+        <content type="nonnegative_integer"/>
       </parameter>
       <parameter name="stop-all-resources" advanced="0" generated="0">
         <longdesc lang="en">Whether the cluster should stop all active resources</longdesc>
         <shortdesc lang="en">Whether the cluster should stop all active resources</shortdesc>
         <content type="boolean" default=""/>
       </parameter>
       <parameter name="stop-removed-resources" advanced="0" generated="0">
+        <deprecated/>
         <longdesc lang="en">Whether to stop resources that were removed from the configuration</longdesc>
         <shortdesc lang="en">Whether to stop resources that were removed from the configuration</shortdesc>
         <content type="boolean" default=""/>
@@ -988,17 +981,18 @@ Also known as properties, these are options that affect behavior across the enti
         <shortdesc lang="en">Deprecated alias for stop-removed-resources</shortdesc>
         <content type="boolean" default=""/>
       </parameter>
-      <parameter name="stop-removed-actions" advanced="0" generated="0">
+      <parameter name="cancel-removed-actions" advanced="0" generated="0">
+        <deprecated/>
         <longdesc lang="en">Whether to cancel recurring actions removed from the configuration</longdesc>
         <shortdesc lang="en">Whether to cancel recurring actions removed from the configuration</shortdesc>
         <content type="boolean" default=""/>
       </parameter>
       <parameter name="stop-orphan-actions" advanced="0" generated="0">
         <deprecated>
-          <replaced-with name="stop-removed-actions"/>
+          <replaced-with name="cancel-removed-actions"/>
         </deprecated>
-        <longdesc lang="en">Deprecated alias for stop-removed-actions</longdesc>
-        <shortdesc lang="en">Deprecated alias for stop-removed-actions</shortdesc>
+        <longdesc lang="en">Deprecated alias for cancel-removed-actions</longdesc>
+        <shortdesc lang="en">Deprecated alias for cancel-removed-actions</shortdesc>
         <content type="boolean" default=""/>
       </parameter>
       <parameter name="pe-error-series-max" advanced="0" generated="0">

cts/cli/regression.daemons.exp

@@ -21,12 +21,12 @@
     </parameter>
     <parameter name="cluster-ipc-limit">
       <longdesc lang="en">
-        Raise this if log has "Evicting client" messages for cluster PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).
+        Ignored
       </longdesc>
       <shortdesc lang="en">
-        Maximum IPC message backlog before disconnecting a client
+        *** Deprecated ***
       </shortdesc>
-      <content type="integer" default=""/>
+      <content type="integer"/>
     </parameter>
   </parameters>
 </resource-agent>
@@ -540,7 +540,7 @@
         Whether the cluster should check for active resources during start-up
       </longdesc>
       <shortdesc lang="en">
-        Whether the cluster should check for active resources during start-up
+        *** Deprecated ***
       </shortdesc>
       <content type="boolean" default=""/>
     </parameter>
@@ -699,7 +699,7 @@
         Whether to stop resources that were removed from the configuration
       </longdesc>
       <shortdesc lang="en">
-        Whether to stop resources that were removed from the configuration
+        *** Deprecated ***
       </shortdesc>
       <content type="boolean" default=""/>
     </parameter>
@@ -712,21 +712,21 @@
       </shortdesc>
       <content type="boolean" default=""/>
     </parameter>
-    <parameter name="stop-removed-actions">
+    <parameter name="cancel-removed-actions">
       <longdesc lang="en">
         Whether to cancel recurring actions removed from the configuration
       </longdesc>
       <shortdesc lang="en">
-        Whether to cancel recurring actions removed from the configuration
+        *** Deprecated ***
       </shortdesc>
       <content type="boolean" default=""/>
     </parameter>
     <parameter name="stop-orphan-actions">
       <longdesc lang="en">
-        Deprecated alias for stop-removed-actions
+        Deprecated alias for cancel-removed-actions
       </longdesc>
       <shortdesc lang="en">
-        *** Deprecated *** *** Replaced with stop-removed-actions ***
+        *** Deprecated *** *** Replaced with cancel-removed-actions ***
       </shortdesc>
       <content type="boolean" default=""/>
     </parameter>

cts/scheduler/xml/asymmetric.xml

@@ -4,8 +4,6 @@
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="dc-version" value="0.6.3-node: fd8904c9bc67a2396bb5a7908bc7de0540241b1a"/>
         <nvpair id="nvpair.id21859" name="symmetric-cluster" value="false"/>
-        <nvpair id="nvpair.id21878" name="stop-removed-resources" value="true"/>
-        <nvpair id="nvpair.id21887" name="stop-removed-actions" value="true"/>
         <nvpair id="nvpair.id21897" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21906" name="fencing-enabled" value="false"/>
         <nvpair id="nvpair.id21915" name="fencing-action" value="reboot"/>

cts/scheduler/xml/bug-1572-1.xml

@@ -6,8 +6,6 @@
         <nvpair id="nvpair.id21859" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21887" name="fencing-enabled" value="false"/>
         <nvpair id="nvpair.id21896" name="fencing-action" value="reboot"/>
-        <nvpair id="nvpair.id21905" name="stop-removed-resources" value="true"/>
-        <nvpair id="nvpair.id21914" name="stop-removed-actions" value="true"/>
         <nvpair id="nvpair.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair name="last-lrm-refresh" id="nvpair.id21970" value="1178199084"/>
       </cluster_property_set>

cts/scheduler/xml/bug-1572-2.xml

@@ -6,8 +6,6 @@
         <nvpair id="nvpair.id21859" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21887" name="fencing-enabled" value="false"/>
         <nvpair id="nvpair.id21896" name="fencing-action" value="reboot"/>
-        <nvpair id="nvpair.id21905" name="stop-removed-resources" value="true"/>
-        <nvpair id="nvpair.id21914" name="stop-removed-actions" value="true"/>
         <nvpair id="nvpair.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair name="last-lrm-refresh" id="nvpair.id21970" value="1178199084"/>
       </cluster_property_set>

cts/scheduler/xml/bug-1573.xml

@@ -6,8 +6,6 @@
         <nvpair id="nvpair.id21858" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21886" name="fencing-enabled" value="false"/>
         <nvpair id="nvpair.id21895" name="fencing-action" value="reboot"/>
-        <nvpair id="nvpair.id21904" name="stop-removed-resources" value="true"/>
-        <nvpair id="nvpair.id21914" name="stop-removed-actions" value="true"/>
         <nvpair id="nvpair.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair id="nvpair.id21969" name="last-lrm-refresh" value="1179263353"/>
       </cluster_property_set>

cts/scheduler/xml/bug-1685.xml

@@ -5,9 +5,7 @@
         <nvpair id="nvpair.id21858" name="startup-fencing" value="true"/>
         <nvpair id="nvpair.id21867" name="fencing-enabled" value="false"/>
         <nvpair id="nvpair.id21876" name="symmetric-cluster" value="true"/>
-        <nvpair id="nvpair.id21885" name="stop-removed-actions" value="true"/>
         <nvpair id="nvpair.id21894" name="fencing-action" value="reboot"/>
-        <nvpair id="nvpair.id21913" name="stop-removed-resources" value="true"/>
         <nvpair id="nvpair.id21922" name="no-quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21941" name="probe_complete" value="true"/>
         <nvpair id="nvpair.id21950" name="transition-idle-timeout" value="60s"/>

cts/scheduler/xml/bug-1822.xml

@@ -7,8 +7,6 @@
         <nvpair id="nvpair.id21884" name="cluster-delay" value="180s"/>
         <nvpair id="nvpair.id21901" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21910" name="symmetric-cluster" value="true"/>
-        <nvpair id="nvpair.id21938" name="stop-removed-resources" value="true"/>
-        <nvpair id="nvpair.id21947" name="stop-removed-actions" value="true"/>
         <nvpair id="nvpair.id21965" name="dc-deadtime" value="10s"/>
         <nvpair id="nvpair.id21973" name="cluster-recheck-interval" value="0"/>
         <nvpair id="nvpair.id21982" name="election-timeout" value="2min"/>

cts/scheduler/xml/clone-anon-dup.xml

@@ -5,8 +5,6 @@
         <nvpair id="symmetric-cluster" name="symmetric-cluster" value="true"/>
         <nvpair id="transition-idle-timeout" name="transition-idle-timeout" value="60"/>
         <nvpair id="no-quorum-policy" name="no-quorum-policy" value="stop"/>
-        <nvpair id="stop-removed-resources" name="stop-removed-resources" value="false"/>
-        <nvpair id="stop-removed-actions" name="stop-removed-actions" value="true"/>
         <nvpair id="fencing-enabled" name="fencing-enabled" value="true"/>
         <nvpair id="fencing-action" name="fencing-action" value="reboot"/>
         <!-- see /usr/lib/heartbeat/crmd metadata - set to defaults -->