3d429d5100
- rpm: build with --with-sbd-sync-default="true" only for sle_version >= 150400 (bsc#1180966) - rpm: build with --enable-legacy-links only for suse_version < 1600 - rpm: build with --enable-compat-2.0 only for suse_version < 1600 (jsc#PED-106, jsc#PED-294) - rpm: build with --with-concurrent-fencing-default=true only for sle_version >= 150400 - rpm: build with --with-resource-stickiness-default=1 only for sle_version >= 150400 - rpm: build with --with-nagios=true only for suse_version < 1600 (jsc#PED-3877, jsc#PED-4446) - agents: create symlink ocf:pacemaker:NodeUtilization only for suse_version < 1600 in favor of ocf💓NodeUtilization (bsc#1070347) - Update to version 2.1.6+20230524.6fdc9deea (Pacemaker-2.1.6): - scheduler: ensure earlier group member starts happen after later member stops - Update to version 2.1.5+20230502.802a72226 (Pacemaker-2.1.6-rc2): - rpm: avoid bare wildcards under shared directories in spec - scheduler: consider mandatory colocations before optional - Update to version 2.1.5+20230501.832463d94: - daemons: pacemakerd -S should wait for shutdown before returning (bsc#1210857) - Update to version 2.1.5+20230501.b049bbeea: - scheduler: deprecate support for Nagios resources (jsc#PED-3877, jsc#PED-4446) - scheduler: deprecate "moon" in date_spec elements in rules - daemons: Preserve transient attrs when possible - daemons: Sync remote connection info with new controllers. - daemons: Record the node hosting a remote connection resource. - daemons: Add node hosting connection resource to state XML. - daemons: Broadcast remote node state changes to all controllers - daemons: Add daemon uptime to execd XML replies. - Update to version 2.1.5+20230424.6127934e3: - fencer: fencing timeout sent to peer takes no delay into account (bsc#1210074) OBS-URL: https://build.opensuse.org/request/show/1093808 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=383
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
|