1cc6788b86
- Filesystem: fail if AWS efs-utils not installed when fstype=efs Resolves: rhbz#2182415 Resolves: rhbz#2183133
78 lines
3.3 KiB
Diff
78 lines
3.3 KiB
Diff
From ff53e5c8d6867e580506d132fba6fcf6aa46b804 Mon Sep 17 00:00:00 2001
|
|
From: Peter Varkoly <varkoly@suse.com>
|
|
Date: Sat, 29 Apr 2023 08:09:11 +0200
|
|
Subject: [PATCH] Use -LS instead of -Ls as parameter to get the Transition
|
|
Summary
|
|
|
|
---
|
|
heartbeat/azure-events-az.in | 9 +++++----
|
|
heartbeat/azure-events.in | 9 +++++----
|
|
2 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/heartbeat/azure-events-az.in b/heartbeat/azure-events-az.in
|
|
index 67c02c642..46d4d1f3d 100644
|
|
--- a/heartbeat/azure-events-az.in
|
|
+++ b/heartbeat/azure-events-az.in
|
|
@@ -298,7 +298,7 @@ class clusterHelper:
|
|
Get the current Pacemaker transition summary (used to check if all resources are stopped when putting a node standby)
|
|
"""
|
|
# <tniek> Is a global crm_simulate "too much"? Or would it be sufficient it there are no planned transitions for a particular node?
|
|
- # # crm_simulate -Ls
|
|
+ # # crm_simulate -LS
|
|
# Transition Summary:
|
|
# * Promote rsc_SAPHana_HN1_HDB03:0 (Slave -> Master hsr3-db1)
|
|
# * Stop rsc_SAPHana_HN1_HDB03:1 (hsr3-db0)
|
|
@@ -308,15 +308,16 @@ class clusterHelper:
|
|
# Transition Summary:
|
|
ocf.logger.debug("transitionSummary: begin")
|
|
|
|
- summary = clusterHelper._exec("crm_simulate", "-Ls")
|
|
+ summary = clusterHelper._exec("crm_simulate", "-LS")
|
|
if not summary:
|
|
ocf.logger.warning("transitionSummary: could not load transition summary")
|
|
return ""
|
|
if summary.find("Transition Summary:") < 0:
|
|
ocf.logger.debug("transitionSummary: no transactions: %s" % summary)
|
|
return ""
|
|
- summary = summary.split("Transition Summary:")[1]
|
|
- ret = summary.split("\n").pop(0)
|
|
+ j=summary.find('Transition Summary:') + len('Transition Summary:')
|
|
+ l=summary.lower().find('executing cluster transition:')
|
|
+ ret = list(filter(str.strip, summary[j:l].split("\n")))
|
|
|
|
ocf.logger.debug("transitionSummary: finished; return = %s" % str(ret))
|
|
return ret
|
|
diff --git a/heartbeat/azure-events.in b/heartbeat/azure-events.in
|
|
index 5ad658df9..90acaba62 100644
|
|
--- a/heartbeat/azure-events.in
|
|
+++ b/heartbeat/azure-events.in
|
|
@@ -297,7 +297,7 @@ class clusterHelper:
|
|
Get the current Pacemaker transition summary (used to check if all resources are stopped when putting a node standby)
|
|
"""
|
|
# <tniek> Is a global crm_simulate "too much"? Or would it be sufficient it there are no planned transitions for a particular node?
|
|
- # # crm_simulate -Ls
|
|
+ # # crm_simulate -LS
|
|
# Transition Summary:
|
|
# * Promote rsc_SAPHana_HN1_HDB03:0 (Slave -> Master hsr3-db1)
|
|
# * Stop rsc_SAPHana_HN1_HDB03:1 (hsr3-db0)
|
|
@@ -307,15 +307,16 @@ class clusterHelper:
|
|
# Transition Summary:
|
|
ocf.logger.debug("transitionSummary: begin")
|
|
|
|
- summary = clusterHelper._exec("crm_simulate", "-Ls")
|
|
+ summary = clusterHelper._exec("crm_simulate", "-LS")
|
|
if not summary:
|
|
ocf.logger.warning("transitionSummary: could not load transition summary")
|
|
return ""
|
|
if summary.find("Transition Summary:") < 0:
|
|
ocf.logger.debug("transitionSummary: no transactions: %s" % summary)
|
|
return ""
|
|
- summary = summary.split("Transition Summary:")[1]
|
|
- ret = summary.split("\n").pop(0)
|
|
+ j=summary.find('Transition Summary:') + len('Transition Summary:')
|
|
+ l=summary.lower().find('executing cluster transition:')
|
|
+ ret = list(filter(str.strip, summary[j:l].split("\n")))
|
|
|
|
ocf.logger.debug("transitionSummary: finished; return = %s" % str(ret))
|
|
return ret
|