f282465d02
- Update to version 2.0.0+20180726.3d81c89b8: - Shutdown corosync after a fatal error - tools: ipmiservicelogd FTBFS on ppc64le - tools: notifyServicelogEvent FTBFS on ppc64le - tools: detect CIB directory correctly - tools: avoid memory leak when crm_resource checks resource - controller: avoid any chance of use-of-NULL when doing LRM op - resources: controld doesn't need to check for corosync 1 plugin - resources: use correct variable name in Stateful - cts-scheduler: restore ability to pass arguments to single test run - resources: use ocf_is_true in SysInfo - spec: drop superfluous dependency of -libs-devel on -cts - tools: update URL in crm_simulate help - crm_mon: rhbz#1461964 - add fence history features - Update to version 2.0.0+20180706.8cf3fe749 (Pacemaker-2.0.0): - tools: Multiple -V increase debug level (#1526) - scheduler: clarify multiple-anonymous-instances message - scheduler: avoid use-after-free when on-fail=block - controller: add node name to meta-data call environment - controller: filter certain synthesized failures from CIB - controller: filter certain action timeouts from CIB - controller: don't record pending notifies in CIB - executor: cancel recurring monitors if fence device registration is lost - controller: avoid memory leak if start-up fails - XML: schemas.c: fix possible memleak + less magic with numeric constants - tools: stonith_admin -h/-H options are queries - libstonithd: avoid memory leak when getting meta-data - XML: resources-3.1.rng: relaxed schema after tight upgrade enforcement - XML: schemas.c: take severities of XSLT messages into account properly OBS-URL: https://build.opensuse.org/request/show/625813 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=307
22 lines
983 B
Diff
22 lines
983 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.0+20180726.3d81c89b8/extra/resources/controld
|
|
===================================================================
|
|
--- pacemaker-2.0.0+20180726.3d81c89b8.orig/extra/resources/controld
|
|
+++ pacemaker-2.0.0+20180726.3d81c89b8/extra/resources/controld
|
|
@@ -224,10 +224,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 '*' -V | grep -q "wishes to"; then
|
|
- ocf_log err "DLM status is: wait fencing"
|
|
- CM_RC=$OCF_ERR_GENERIC
|
|
else
|
|
CM_RC=$OCF_SUCCESS
|
|
fi
|