5093f2c7d6
- Update to version 2.1.5+20221208.a3f44794f (Pacemaker-2.1.5): - libs: Check for NULL in various functions. - daemons: Check for NULL in attrd_create_attribute. - Update to version 2.1.4+20221122.631339ca5 (Pacemaker-2.1.5-rc3): - libcrmcommon: Wait for ACKs from the attrd clear failure command. - daemons: Fix expanding ++ and += in multi-update IPC messages. - daemons: Add host attr to the children of multi-update IPC messages. - daemons: Copy all attrs from parent to child in multi-update IPC. - Update to version 2.1.4+20221115.d3699a621 (Pacemaker-2.1.5-rc2): - tools: quote timestamp in operation history output (bsc#1205279, bsc#1204581) - tools: Fix setting utilization attrs with crm_attribute. - cts-cli: add test for text output of crm_resource --list-operations/-O (bsc#1205279, bsc#1204581) - daemons: Set an attribute on the child of a multi-attr message. - scheduler: consider roles when blocking colocation dependents - scheduler: when blocking starts, block children's starts as well - Update to version 2.1.4+20221108.ba419204a: - tools: crm_resource --constraints now accepts --force - tools: crm_resource --constraints --recursive - tools: fix syntax on resetting options in crm_resource (bsc#1198409) - Update to version 2.1.4+20221031.0b3656e85: - scheduler: prioritize group colocations properly - scheduler: ignore empty groups in pcmk__add_colocated_node_scores() - scheduler: properly consider effect of "with group" colocations - scheduler: ensure group methods handle empty groups - scheduler: improve error handling when unpacking resources OBS-URL: https://build.opensuse.org/request/show/1042324 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=369
22 lines
1023 B
Diff
22 lines
1023 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.in
|
|
===================================================================
|
|
--- pacemaker-2.0.2+20190725.4b4fea3eb.orig/extra/resources/controld.in
|
|
+++ pacemaker-2.0.2+20190725.4b4fea3eb/extra/resources/controld.in
|
|
@@ -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
|