d854adba09
- CTS: Fix cts-lab --list. (gh#ClusterLabs/pacemaker#3723) - Update to version 2.1.9+20241105.e043e6816a: - executor: avoid use-after-free upon shutdown (bsc#1232613, gh#ClusterLabs/pacemaker#3719) - Update to version 2.1.9+20241031.49aab99839 (Pacemaker-2.1.9): - includes: Bump CRM_FEATURE_SET for iso8601 formatted output. - schemas: Add an XML schema for iso8601 output. - tools: Convert iso8601 to formatted output. - Update to version 2.1.8+20241021.40d69ff424 (Pacemaker-2.1.9-rc3): - tools: restore crmadmin default timeout to 30 seconds (bsc#1217259, bsc#1228781, jsc#PED-8311, gh#ClusterLabs/pacemaker#3703) - libcrmcommon: any negative interval is an error - agents: always allow attribute agent to show metadata - agents: use RESOURCENAME in attribute agent metadata - agents: use configured run directory in attribute agent - controld: leave xml-src attribute empty when no DC selected #2902 (bsc#1217259, bsc#1228781, jsc#PED-8311, gh#ClusterLabs/pacemaker#3702) - Update to version 2.1.8+20241015.33f3052b89 (Pacemaker-2.1.9-rc2): - pacemakerd: combine subdaemon start-up logs - libcrmcommon: avoid potential overflow when adding seconds - libcib: Perform server-side remote CIB reads asynchronously. - libcib: Perform client-side remote CIB reads asynchronously. - tools: crm_resource returns error on failed schema upgrade - libcrmcommon: Don't assert on failure to write errors. (gh#ClusterLabs/pacemaker#3684) - Update to version 2.1.8+20241003.95cef6b307 (Pacemaker-2.1.9-rc1): - NLS: update translations for current code base - scheduler: Fixed memory leak when searching for unfencing devices. (gh#ClusterLabs/pacemaker#3678) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=405
22 lines
1008 B
Diff
22 lines
1008 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/agents/ocf/controld.in
|
|
===================================================================
|
|
--- pacemaker-2.0.2+20190725.4b4fea3eb.orig/agents/ocf/controld.in
|
|
+++ pacemaker-2.0.2+20190725.4b4fea3eb/agents/ocf/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
|