76130e9731
- controld: Prevent unwanted self-fencing if "stateful_merge_wait" state of dlm is not available (bsc#977201) * bug-977201_pacemaker-controld-self-fencing.patch - libservices: clean up non-signalfd code paths - spec: fence_pcmk only eligible for Pacemaker+CMAN - crmd: Acknowledge cancellation operations for remote connection resources (bsc#976865) - controld: improve DLM check with stateful_merge_wait (bsc#977201) - attrd, libcrmcommon: validate attrd requests better - crmd: clear remote node transient attributes on disconnect - Revert "Fix: attrd: Correctly implement mass removal of a node's attributes" - crm_mon: Fix time formatting on x32 - resources: use OCF version tagging correctly - libcommon: crm_procfs_pid_of() would always return last /proc entry checked - crmd: correctly dig into cib-query-answer if alerts section is present timestamp-format defaults to "%H:%M:%S.%06N" - crmd: Take start-delay into account for the timeout of the action timer (bsc#977258) - libservices: make systemd override file world-readable to avoid log warning - libcrmcommon: correct directory name in log message - Log: make crmd messages more user-friendly - Log: make messages in common quorum/fencing situations more user-friendly - Log: make shutdown messages more user-friendly - pengine: lf#2560/lf#2588 - Correctly set the environment variable "OCF_RESKEY_CRM_meta_timeout" when "start-delay" is configured (bsc#977258) - Log: make operation messages more user-friendly - Log: make startup messages more user-friendly - services: Correctly clean up service actions for non-dbus case - uninitialized use of nano_digits - attrd: Update also dampens when synchronizing attributes (bsc#977846) - Upstream version cs: 389294fd1ebefddad67fff51306f585b758ca860 OBS-URL: https://build.opensuse.org/request/show/398795 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=244
26 lines
970 B
Diff
26 lines
970 B
Diff
commit f61b9889cd169ce2c715a5cc4808321977432ec0
|
|
Author: Gao,Yan <ygao@suse.com>
|
|
Date: Sun May 29 20:31:25 2016 +0200
|
|
|
|
Fix: controld: Prevent unwanted self-fencing if "stateful_merge_wait" state of dlm is not available
|
|
|
|
diff --git a/extra/resources/controld b/extra/resources/controld
|
|
index 7d75319..908e2ca 100644
|
|
--- a/extra/resources/controld
|
|
+++ b/extra/resources/controld
|
|
@@ -229,13 +229,9 @@ controld_monitor() {
|
|
|
|
case $rc in
|
|
0) smw=$(dlm_tool status -v | grep "stateful_merge_wait=" | cut -d= -f2)
|
|
- if [ $smw -eq 1 ]; then
|
|
+ if [ "$smw" = "1" ]; then
|
|
ocf_log err "DLM status is: stateful_merge_wait"
|
|
rc=$OCF_ERR_GENERIC
|
|
- elif [ -z "$smw" ] && dlm_tool ls | grep -q "wait fencing" && \
|
|
- ! stonith_admin -H -V | grep -q "wishes to"; then
|
|
- ocf_log err "DLM status is: wait fencing"
|
|
- rc=$OCF_ERR_GENERIC
|
|
else
|
|
rc=$OCF_SUCCESS
|
|
fi
|