|
 |
305287 |
From d6e2db2702aa533bca7208bbdc18cb4254cc89d2 Mon Sep 17 00:00:00 2001
|
|
|
305287 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
305287 |
Date: Thu, 6 Jun 2019 14:18:37 -0500
|
|
|
305287 |
Subject: [PATCH] Test: scheduler: explicitly set concurrent-fencing in
|
|
|
305287 |
relevant regression tests
|
|
|
305287 |
|
|
|
305287 |
... since concurrent-fencing's default is likely to eventually change,
|
|
|
305287 |
which would otherwise affect the results of these tests
|
|
|
305287 |
---
|
|
|
305287 |
cts/scheduler/rec-node-14.xml | 1 +
|
|
|
305287 |
cts/scheduler/remote-connection-unrecoverable.xml | 1 +
|
|
|
305287 |
cts/scheduler/remote-recover-all.xml | 1 +
|
|
|
305287 |
cts/scheduler/remote-recover-no-resources.xml | 1 +
|
|
|
305287 |
cts/scheduler/remote-recover-unknown.xml | 1 +
|
|
|
305287 |
cts/scheduler/stonith-4.xml | 1 +
|
|
|
305287 |
cts/scheduler/suicide-needed-inquorate.xml | 1 +
|
|
|
305287 |
cts/scheduler/ticket-clone-21.xml | 1 +
|
|
|
305287 |
cts/scheduler/ticket-clone-9.xml | 1 +
|
|
|
305287 |
9 files changed, 9 insertions(+)
|
|
|
305287 |
|
|
|
305287 |
diff --git a/cts/scheduler/rec-node-14.xml b/cts/scheduler/rec-node-14.xml
|
|
|
305287 |
index 60307ba..aefa410 100644
|
|
|
305287 |
--- a/cts/scheduler/rec-node-14.xml
|
|
|
305287 |
+++ b/cts/scheduler/rec-node-14.xml
|
|
|
305287 |
@@ -4,6 +4,7 @@
|
|
|
305287 |
<cluster_property_set id="cib-bootstrap-options">
|
|
|
305287 |
<nvpair id="nvpair.id21835" name="stonith-enabled" value="true"/>
|
|
|
305287 |
<nvpair id="nvpair.id21844" name="no-quorum-policy" value="ignore"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
</crm_config>
|
|
|
305287 |
<nodes>
|
|
|
305287 |
diff --git a/cts/scheduler/remote-connection-unrecoverable.xml b/cts/scheduler/remote-connection-unrecoverable.xml
|
|
|
305287 |
index df9fee2..efec646 100644
|
|
|
305287 |
--- a/cts/scheduler/remote-connection-unrecoverable.xml
|
|
|
305287 |
+++ b/cts/scheduler/remote-connection-unrecoverable.xml
|
|
|
305287 |
@@ -7,6 +7,7 @@
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-cluster-name" name="cluster-name" value="mycluster"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1459735110"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
</crm_config>
|
|
|
305287 |
<nodes>
|
|
|
305287 |
diff --git a/cts/scheduler/remote-recover-all.xml b/cts/scheduler/remote-recover-all.xml
|
|
|
305287 |
index 0ade7cd..1680166 100644
|
|
|
305287 |
--- a/cts/scheduler/remote-recover-all.xml
|
|
|
305287 |
+++ b/cts/scheduler/remote-recover-all.xml
|
|
|
305287 |
@@ -10,6 +10,7 @@
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-cluster-recheck-interval" name="cluster-recheck-interval" value="60s"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-maintenance-mode" name="maintenance-mode" value="false"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1493817755"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
<cluster_property_set id="redis_replication">
|
|
|
305287 |
<nvpair id="redis_replication-redis_REPL_INFO" name="redis_REPL_INFO" value="controller-0"/>
|
|
|
305287 |
diff --git a/cts/scheduler/remote-recover-no-resources.xml b/cts/scheduler/remote-recover-no-resources.xml
|
|
|
305287 |
index 37708bb..602ed2b 100644
|
|
|
305287 |
--- a/cts/scheduler/remote-recover-no-resources.xml
|
|
|
305287 |
+++ b/cts/scheduler/remote-recover-no-resources.xml
|
|
|
305287 |
@@ -10,6 +10,7 @@
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-cluster-recheck-interval" name="cluster-recheck-interval" value="60s"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-maintenance-mode" name="maintenance-mode" value="false"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1493817755"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
<cluster_property_set id="redis_replication">
|
|
|
305287 |
<nvpair id="redis_replication-redis_REPL_INFO" name="redis_REPL_INFO" value="controller-0"/>
|
|
|
305287 |
diff --git a/cts/scheduler/remote-recover-unknown.xml b/cts/scheduler/remote-recover-unknown.xml
|
|
|
305287 |
index f070f11..f47a841 100644
|
|
|
305287 |
--- a/cts/scheduler/remote-recover-unknown.xml
|
|
|
305287 |
+++ b/cts/scheduler/remote-recover-unknown.xml
|
|
|
305287 |
@@ -10,6 +10,7 @@
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-cluster-recheck-interval" name="cluster-recheck-interval" value="60s"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-maintenance-mode" name="maintenance-mode" value="false"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1493817755"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
<cluster_property_set id="redis_replication">
|
|
|
305287 |
<nvpair id="redis_replication-redis_REPL_INFO" name="redis_REPL_INFO" value="controller-0"/>
|
|
|
305287 |
diff --git a/cts/scheduler/stonith-4.xml b/cts/scheduler/stonith-4.xml
|
|
|
305287 |
index 7979462..dd7af8d 100644
|
|
|
305287 |
--- a/cts/scheduler/stonith-4.xml
|
|
|
305287 |
+++ b/cts/scheduler/stonith-4.xml
|
|
|
305287 |
@@ -4,6 +4,7 @@
|
|
|
305287 |
<cluster_property_set id="cib-bootstrap-options">
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.8-0.772.26fe3e5.git.fc17-26fe3e52d259e4726699300d27991fc1a80c556b"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
</crm_config>
|
|
|
305287 |
<nodes>
|
|
|
305287 |
diff --git a/cts/scheduler/suicide-needed-inquorate.xml b/cts/scheduler/suicide-needed-inquorate.xml
|
|
|
305287 |
index e626ea6..f87422b 100644
|
|
|
305287 |
--- a/cts/scheduler/suicide-needed-inquorate.xml
|
|
|
305287 |
+++ b/cts/scheduler/suicide-needed-inquorate.xml
|
|
|
305287 |
@@ -6,6 +6,7 @@
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.17-1"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="suicide"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
</crm_config>
|
|
|
305287 |
<nodes>
|
|
|
305287 |
diff --git a/cts/scheduler/ticket-clone-21.xml b/cts/scheduler/ticket-clone-21.xml
|
|
|
305287 |
index bb1f044..efd5294 100644
|
|
|
305287 |
--- a/cts/scheduler/ticket-clone-21.xml
|
|
|
305287 |
+++ b/cts/scheduler/ticket-clone-21.xml
|
|
|
305287 |
@@ -4,6 +4,7 @@
|
|
|
305287 |
<cluster_property_set id="cib-bootstrap-options">
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
</crm_config>
|
|
|
305287 |
<nodes>
|
|
|
305287 |
diff --git a/cts/scheduler/ticket-clone-9.xml b/cts/scheduler/ticket-clone-9.xml
|
|
|
305287 |
index e77210d..c6d5809 100644
|
|
|
305287 |
--- a/cts/scheduler/ticket-clone-9.xml
|
|
|
305287 |
+++ b/cts/scheduler/ticket-clone-9.xml
|
|
|
305287 |
@@ -4,6 +4,7 @@
|
|
|
305287 |
<cluster_property_set id="cib-bootstrap-options">
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true"/>
|
|
|
305287 |
<nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
|
|
|
305287 |
+ <nvpair id="options-concurrent-fencing" name="concurrent-fencing" value="false"/>
|
|
|
305287 |
</cluster_property_set>
|
|
|
305287 |
</crm_config>
|
|
|
305287 |
<nodes>
|
|
|
305287 |
--
|
|
|
305287 |
1.8.3.1
|
|
|
305287 |
|