1d3135f1d3
- libcrmcommon: really ensure crm_time_t structure is fully initialized by API calls - extra: correct syntax error in sample alert script - crmd: avoid timeout on older peers when cancelling a resource operation - crmd: use proper resource agent name when caching metadata - crmd: avoid memory leak when sending fencing alert - liblrmd: avoid memory leak when closing or deleting lrmd connections - extra: improve determination of successful monitors in SNMP alert script - tools: avoid memory leak when crm_mon unpacks constraints - pengine: avoid use-after-free with location constraint + sets + templates - pengine: better error handling when unpacking sets in location constraints - pengine: avoid memory leak when invalid constraint involves set - Build: rename sample alert scripts and install them in datadir - pengine : Correction of the record judgment of the failed information. - Upstream version cs: dd46368eead0d756735216a4bc765466b99274fc - alert-helpers: some fixes in pcmk_smtp_helper.sh - libpengine: log message when stonith disabled, not enabled - pengine: only set unfencing constraints once - tools: don't require node to be known to crm_resource when deleting attribute - libcrmcommon: ensure crm_time_t structure is fully initialized by API calls - attrd: don't leak memory when returning due to malformed update request - crmd: always free result of crm_itoa() - xml: adapt crm_mon.rng per recent reorder of the summary elements - Upstream version cs: 1a05449500f015414b6df68b6d4feb64b713f533 - Rebase: * bug-977201_pacemaker-controld-self-fencing.patch - pengine: properly order stop actions relative to stonith - crm_resource: don't pretend that target-role:started would prevent promotion - crm_mon: consistently print ms resource state OBS-URL: https://build.opensuse.org/request/show/401722 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=246
22 lines
856 B
Diff
22 lines
856 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
|
|
|
|
diff --git a/extra/resources/controld b/extra/resources/controld
|
|
index ddb514a..37d5c62 100644
|
|
--- a/extra/resources/controld
|
|
+++ b/extra/resources/controld
|
|
@@ -232,10 +232,6 @@ controld_monitor() {
|
|
if [ -n "$smw" ] && [ $smw -eq 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
|