154c80f970
- Update to version 2.0.2+20190801.122c32115: - libcib: install cib_types.h - tools: Use glib for cmdline handling in crm_mon. - libcrmcommon: Handle no digits in crm_int_helper. - libcrmcommon: Allow glib cmdline parsing without formatted output. - extra: calculate #health_disk correctly in SysInfo - extra: handle run-as-user properly in ClusterMon - extra: advertise promote and demote in Stateful meta-data - extra: formally deprecate the ocf:pacemaker:pingd agent - extra: quote shell variables in agent code where appropriate - extra: use ":=" where appropriate in agent code - Update to version 2.0.2+20190725.4b4fea3eb: - Rebase: * bug-977201_pacemaker-controld-self-fencing.patch - libcrmcommon: Restore getopt behavior in stonith_admin. - controller: document the cluster-name cluster property - controller: allow configurable reaction to local node fencing - pacemakerd: make daemon exit detection messages more consistent - executor: stonith probes should fail only if previously registered - libstonithd: handle API creation errors better - spec: avoid long-broken (in a pristine tree state) "make all" - controller: panic local host if notified of own fencing - controller: clear "required" bit when disconnecting scheduler - libcrmcommon: Remove -q from global cmdline options. - tools: Allow HTML output in stonith_admin. - libstonithd: Add HTML support to fencing messages. - st_client: Reword stonith_event_text. - controld: Use XML output to check for pending status. - pengine: formatted output for html OBS-URL: https://build.opensuse.org/request/show/721844 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=329
22 lines
1014 B
Diff
22 lines
1014 B
Diff
commit c199dc320b4faa01c19df68a9f2566465f5afa2c
|
|
Author: Gao,Yan <ygao@suse.com>
|
|
Date: Mon Jun 13 17:26:27 2016 +0200
|
|
|
|
Fix: controld: Prevent unwanted self-fencing if "stateful_merge_wait" state of dlm is not available
|
|
|
|
Index: pacemaker-2.0.2+20190725.4b4fea3eb/extra/resources/controld
|
|
===================================================================
|
|
--- pacemaker-2.0.2+20190725.4b4fea3eb.orig/extra/resources/controld
|
|
+++ pacemaker-2.0.2+20190725.4b4fea3eb/extra/resources/controld
|
|
@@ -226,10 +226,6 @@ controld_monitor() {
|
|
if [ -n "$smw" ] && [ $smw -eq 1 ]; then
|
|
ocf_log err "DLM status is: stateful_merge_wait"
|
|
CM_RC=$OCF_ERR_GENERIC
|
|
- elif [ -z "$smw" ] && dlm_tool ls | grep -q "wait fencing" && \
|
|
- ! stonith_admin -H '*' --output-as xml | grep -q "extended-status=\"pending\""; then
|
|
- ocf_log err "DLM status is: wait fencing"
|
|
- CM_RC=$OCF_ERR_GENERIC
|
|
else
|
|
CM_RC=$OCF_SUCCESS
|
|
fi
|