c9408c0823
- Update to version 2.1.7+20240711.239cba384: - various: Don't set cluster-layer node ID as XML ID - tools: crm_node -i must initialize nodeid before passing pointer (gh#ClusterLabs/pacemaker#3574) - Update to version 2.1.7+20240709.f04c3b02c: - tools: CIB clients retry signon upon an EAGAIN error (gh#ClusterLabs/pacemaker#3567, bsc#1224183) - libcib: new function cib__signon_attempts() (gh#ClusterLabs/pacemaker#3567, bsc#1224183) - Update to version 2.1.7+20240708.347e83d87: - crm_verify: Improve checking of fencing level IDs - Update to version 2.1.7+20240703.f73f033d5 (Pacemaker-2.1.8-rc3): - sysconfig: deprecate PCMK_dh_min_bits environment variable - Update to version 2.1.7+20240701.8af8b59e2: - libcrmcluster: use local hostname for node name if not configured in corosync (gh#ClusterLabs/pacemaker#3551) - Update to version 2.1.7+20240701.b4e61209c: - tools: Don't double-free XML in crm_verify after schema update - Update to version 2.1.7+20240701.a1003bbf1: - cts-cli: update expected output for crm_verify to distinguish configuration warnings and errors (gh#ClusterLabs/pacemaker#3543) - tools: crm_verify distinguishes configuration warnings and errors (gh#ClusterLabs/pacemaker#3543) - Update to version 2.1.7+20240624.5d44a760b: - libcrmcommon: don't try to add to full string in pcmk__time_format_hr() - libcrmcommon: handle formatting errors in pcmk__time_format_hr() - scheduler: consider group locations when member is explicit colocation dependent - tools: Don't skip formatting if running crm_simulate interactively. OBS-URL: https://build.opensuse.org/request/show/1187166 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=401
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
|