|
 |
356a11 |
From 00fed62ed4899412f65644e6b84e49fbf89d09bb Mon Sep 17 00:00:00 2001
|
|
|
356a11 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
356a11 |
Date: Wed, 2 Aug 2017 19:18:25 -0500
|
|
|
356a11 |
Subject: [PATCH] Fix: pengine: avoid fence loop for remote nodes
|
|
|
356a11 |
|
|
|
356a11 |
This leaves the original issue unaddressed, for investigation later.
|
|
|
356a11 |
---
|
|
|
356a11 |
pengine/allocate.c | 3 +++
|
|
|
356a11 |
pengine/test10/remote-fence-unclean-3.dot | 5 -----
|
|
|
356a11 |
pengine/test10/remote-fence-unclean-3.exp | 29 ---------------------------
|
|
|
356a11 |
pengine/test10/remote-fence-unclean-3.summary | 3 ---
|
|
|
356a11 |
4 files changed, 3 insertions(+), 37 deletions(-)
|
|
|
356a11 |
|
|
|
356a11 |
diff --git a/pengine/allocate.c b/pengine/allocate.c
|
|
|
356a11 |
index 3a883ad..e3cb4cc 100644
|
|
|
356a11 |
--- a/pengine/allocate.c
|
|
|
356a11 |
+++ b/pengine/allocate.c
|
|
|
356a11 |
@@ -905,10 +905,13 @@ probe_resources(pe_working_set_t * data_set)
|
|
|
356a11 |
continue;
|
|
|
356a11 |
|
|
|
356a11 |
} else if (node->details->online == FALSE && node->details->remote_rsc) {
|
|
|
356a11 |
+ // TODO figure out why this results in fence loop
|
|
|
356a11 |
+ /*
|
|
|
356a11 |
enum remote_connection_state state = get_remote_node_state(node);
|
|
|
356a11 |
if(state == remote_state_failed) {
|
|
|
356a11 |
pe_fence_node(data_set, node, "the connection is unrecoverable");
|
|
|
356a11 |
}
|
|
|
356a11 |
+ */
|
|
|
356a11 |
continue;
|
|
|
356a11 |
|
|
|
356a11 |
} else if(node->details->online == FALSE) {
|
|
|
356a11 |
diff --git a/pengine/test10/remote-fence-unclean-3.dot b/pengine/test10/remote-fence-unclean-3.dot
|
|
|
356a11 |
index b32b77e..14adaef 100644
|
|
|
356a11 |
--- a/pengine/test10/remote-fence-unclean-3.dot
|
|
|
356a11 |
+++ b/pengine/test10/remote-fence-unclean-3.dot
|
|
|
356a11 |
@@ -1,5 +1,4 @@
|
|
|
356a11 |
digraph "g" {
|
|
|
356a11 |
-"all_stopped" -> "fence1_start_0 overcloud-controller-0" [ style = bold]
|
|
|
356a11 |
"all_stopped" [ style=bold color="green" fontcolor="orange"]
|
|
|
356a11 |
"fence1_monitor_0 overcloud-controller-0" -> "fence1_start_0 overcloud-controller-0" [ style = bold]
|
|
|
356a11 |
"fence1_monitor_0 overcloud-controller-0" [ style=bold color="green" fontcolor="black"]
|
|
|
356a11 |
@@ -12,8 +11,4 @@ digraph "g" {
|
|
|
356a11 |
"fence1_start_0 overcloud-controller-0" [ style=bold color="green" fontcolor="black"]
|
|
|
356a11 |
"overcloud-novacompute-0_stop_0 overcloud-controller-0" -> "all_stopped" [ style = bold]
|
|
|
356a11 |
"overcloud-novacompute-0_stop_0 overcloud-controller-0" [ style=bold color="green" fontcolor="black"]
|
|
|
356a11 |
-"stonith 'reboot' overcloud-novacompute-0" -> "stonith_complete" [ style = bold]
|
|
|
356a11 |
-"stonith 'reboot' overcloud-novacompute-0" [ style=bold color="green" fontcolor="black"]
|
|
|
356a11 |
-"stonith_complete" -> "all_stopped" [ style = bold]
|
|
|
356a11 |
-"stonith_complete" [ style=bold color="green" fontcolor="orange"]
|
|
|
356a11 |
}
|
|
|
356a11 |
diff --git a/pengine/test10/remote-fence-unclean-3.exp b/pengine/test10/remote-fence-unclean-3.exp
|
|
|
356a11 |
index 2e341bd..64e5a62 100644
|
|
|
356a11 |
--- a/pengine/test10/remote-fence-unclean-3.exp
|
|
|
356a11 |
+++ b/pengine/test10/remote-fence-unclean-3.exp
|
|
|
356a11 |
@@ -21,9 +21,6 @@
|
|
|
356a11 |
</action_set>
|
|
|
356a11 |
<inputs>
|
|
|
356a11 |
<trigger>
|
|
|
356a11 |
- <pseudo_event id="42" operation="all_stopped" operation_key="all_stopped"/>
|
|
|
356a11 |
- </trigger>
|
|
|
356a11 |
- <trigger>
|
|
|
356a11 |
<rsc_op id="43" operation="monitor" operation_key="fence1_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1"/>
|
|
|
356a11 |
</trigger>
|
|
|
356a11 |
<trigger>
|
|
|
356a11 |
@@ -75,29 +72,6 @@
|
|
|
356a11 |
</synapse>
|
|
|
356a11 |
<synapse id="6">
|
|
|
356a11 |
<action_set>
|
|
|
356a11 |
- <pseudo_event id="209" operation="stonith_complete" operation_key="stonith_complete">
|
|
|
356a11 |
- <attributes />
|
|
|
356a11 |
- </pseudo_event>
|
|
|
356a11 |
- </action_set>
|
|
|
356a11 |
- <inputs>
|
|
|
356a11 |
- <trigger>
|
|
|
356a11 |
- <crm_event id="46" operation="stonith" operation_key="stonith-overcloud-novacompute-0-reboot" on_node="overcloud-novacompute-0" on_node_uuid="overcloud-novacompute-0"/>
|
|
|
356a11 |
- </trigger>
|
|
|
356a11 |
- </inputs>
|
|
|
356a11 |
- </synapse>
|
|
|
356a11 |
- <synapse id="7">
|
|
|
356a11 |
- <action_set>
|
|
|
356a11 |
- <crm_event id="46" operation="stonith" operation_key="stonith-overcloud-novacompute-0-reboot" on_node="overcloud-novacompute-0" on_node_uuid="overcloud-novacompute-0">
|
|
|
356a11 |
- <attributes CRM_meta_compute_role="true" CRM_meta_on_node="overcloud-novacompute-0" CRM_meta_on_node_uuid="overcloud-novacompute-0" CRM_meta_stonith_action="reboot" />
|
|
|
356a11 |
- <downed>
|
|
|
356a11 |
- <node id="overcloud-novacompute-0"/>
|
|
|
356a11 |
- </downed>
|
|
|
356a11 |
- </crm_event>
|
|
|
356a11 |
- </action_set>
|
|
|
356a11 |
- <inputs/>
|
|
|
356a11 |
- </synapse>
|
|
|
356a11 |
- <synapse id="8">
|
|
|
356a11 |
- <action_set>
|
|
|
356a11 |
<pseudo_event id="42" operation="all_stopped" operation_key="all_stopped">
|
|
|
356a11 |
<attributes />
|
|
|
356a11 |
</pseudo_event>
|
|
|
356a11 |
@@ -106,9 +80,6 @@
|
|
|
356a11 |
<trigger>
|
|
|
356a11 |
<rsc_op id="30" operation="stop" operation_key="overcloud-novacompute-0_stop_0" on_node="overcloud-controller-0" on_node_uuid="1"/>
|
|
|
356a11 |
</trigger>
|
|
|
356a11 |
- <trigger>
|
|
|
356a11 |
- <pseudo_event id="209" operation="stonith_complete" operation_key="stonith_complete"/>
|
|
|
356a11 |
- </trigger>
|
|
|
356a11 |
</inputs>
|
|
|
356a11 |
</synapse>
|
|
|
356a11 |
</transition_graph>
|
|
|
356a11 |
diff --git a/pengine/test10/remote-fence-unclean-3.summary b/pengine/test10/remote-fence-unclean-3.summary
|
|
|
356a11 |
index ec24500..ec54d8e 100644
|
|
|
356a11 |
--- a/pengine/test10/remote-fence-unclean-3.summary
|
|
|
356a11 |
+++ b/pengine/test10/remote-fence-unclean-3.summary
|
|
|
356a11 |
@@ -34,7 +34,6 @@ Containers: [ galera-bundle-0:galera-bundle-docker-0 galera-bundle-1:galera-bund
|
|
|
356a11 |
openstack-cinder-backup-docker-0 (ocf::heartbeat:docker): Started overcloud-controller-1
|
|
|
356a11 |
|
|
|
356a11 |
Transition Summary:
|
|
|
356a11 |
- * Fence (reboot) overcloud-novacompute-0 'the connection is unrecoverable'
|
|
|
356a11 |
* Start fence1 (overcloud-controller-0)
|
|
|
356a11 |
* Stop overcloud-novacompute-0 (overcloud-controller-0)
|
|
|
356a11 |
|
|
|
356a11 |
@@ -43,8 +42,6 @@ Executing cluster transition:
|
|
|
356a11 |
* Resource action: fence1 monitor on overcloud-controller-1
|
|
|
356a11 |
* Resource action: fence1 monitor on overcloud-controller-0
|
|
|
356a11 |
* Resource action: overcloud-novacompute-0 stop on overcloud-controller-0
|
|
|
356a11 |
- * Fencing overcloud-novacompute-0 (reboot)
|
|
|
356a11 |
- * Pseudo action: stonith_complete
|
|
|
356a11 |
* Pseudo action: all_stopped
|
|
|
356a11 |
* Resource action: fence1 start on overcloud-controller-0
|
|
|
356a11 |
* Resource action: fence1 monitor=60000 on overcloud-controller-0
|
|
|
356a11 |
--
|
|
|
356a11 |
1.8.3.1
|
|
|
356a11 |
|