95ea093b12
- Update to version 1.1.18+20180427.a34ccd926: - crmd: avoid double free after ACL rejection of resource delete - lib: Changed to lowercase comparison. - all: correct misspellings - controld: remove deprecated configdir parameter - controld: deprecate and ignore configdir parameter - controld: consistently indent with spaces instead of tabs - libcrmcommon: don't record pending notify actions as completed - crmd: improve messages when a node is unexpectedly lost - cib: improve shutdown messages - cts-regression: allow specifying to run multiple tests again (bsc#1091360) - Update to version 1.1.18+20180417.24df451b5: - alerts: Delete redundant code. - liblrmd: cast time_t to long long when printing - cts: separate dummy systemd service into separate files * Drop obsolete fate-323526_pacemaker-tests-shebang-python3.patch - crm_diff: rhbz#1561617 - Ignore attribute placement when comparing in 'cib' mode - spec: remove reference to long-gone file - spec: mark -cts & -doc packages as noarch - spec: fix malformed conditional macros for systemd-less cases - alerts: Change timestamp of Alert of snmp. - Update to version 1.1.18+20180411.2f77f4922: - libcrmcommon: free signal triggers when cleaning up mainloop - libcrmcommon: fix memory leak in schema workaround - fencing: avoid memory leaks when freeing remote operation - fencing: free dynamic memory at stonithd shutdown - crmd: delete resource from lrmd when appropriate - Test: rhbz#1565187 - Ensure failures that cause fencing are not removed until after fencing completes OBS-URL: https://build.opensuse.org/request/show/602487 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=304
22 lines
977 B
Diff
22 lines
977 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-1.1.18+20180427.a34ccd926/extra/resources/controld
|
|
===================================================================
|
|
--- pacemaker-1.1.18+20180427.a34ccd926.orig/extra/resources/controld
|
|
+++ pacemaker-1.1.18+20180427.a34ccd926/extra/resources/controld
|
|
@@ -227,10 +227,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
|