drbd-utils/bsc-1219263_crm-fence-peer.9.sh-use-join-of-node_state-to-judge-.patch
heming zhao e0172efba7 Accepting request 1159180 from home:gsu:branches:network:ha-clustering:Factory
- drbd failover timeout because of "fence-peer helper broken" (bsc#1219263)
  * bsc-1219263_crm-fence-peer.9.sh-fix-parsing-in_ccm-crmd-fields-o.patch
  * bsc-1219263_crm-fence-peer.9.sh-use-join-of-node_state-to-judge-.patch

OBS-URL: https://build.opensuse.org/request/show/1159180
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=138
2024-03-19 07:10:21 +00:00

31 lines
1.1 KiB
Diff

From 922e6702cb7a089102f4843b2994ef0749c41573 Mon Sep 17 00:00:00 2001
From: Su Yue <glass.su@suse.com>
Date: Sun, 3 Mar 2024 16:56:38 +0800
Subject: [PATCH 2/2] crm-fence-peer.9.sh: use join of node_state to judge
whether node is banned
crmd in node_state can't be "banned". join should be used instead
of crmd.
Signed-off-by: Su Yue <glass.su@suse.com>
---
scripts/crm-fence-peer.9.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/crm-fence-peer.9.sh b/scripts/crm-fence-peer.9.sh
index a3353a7354a6..b326a1656c15 100755
--- a/scripts/crm-fence-peer.9.sh
+++ b/scripts/crm-fence-peer.9.sh
@@ -934,7 +934,7 @@ guess_if_pacemaker_will_fence()
# for further inspiration, see pacemaker:lib/pengine/unpack.c, determine_online_status_fencing()
[[ -z $in_ccm ]] && will_fence=true
- [[ $crmd = "banned" ]] && will_fence=true
+ [[ $join = "banned" ]] && will_fence=true
if [[ ${expected-down} = "down" && $in_ccm = "false" && $crmd != "online" ]]; then
: "pacemaker considers this as clean down"
elif [[ $in_ccm = false ]] || [[ $crmd != "online" ]]; then
--
2.44.0