Skip to content

feat: add support for fencing-watchdog-timeout #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richm merged 3 commits into from
Dec 1, 2025
Merged

feat: add support for fencing-watchdog-timeout #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15e5668
feat: support fencing-watchdog-timeout cluster property
tomjelinek Nov 26, 2025
aa0202c
test: do not load cib schema version if not needed
tomjelinek Nov 26, 2025
dc828c1
test: fix copy-paste error in a task name
tomjelinek Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tasks/shell_crmsh/create-and-push-cib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
@name="dc-version" or
@name="have-watchdog" or
@name="last-lrm-refresh" or
@name="stonith-watchdog-timeout"
@name="stonith-watchdog-timeout" or
@name="fencing-watchdog-timeout"
)]'
environment:
CIB_file: "{{ __ha_cluster_tempfile_cib_xml.path }}"
Expand Down
3 changes: 2 additions & 1 deletion tasks/shell_pcs/create-and-push-cib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
@name="dc-version" or
@name="have-watchdog" or
@name="last-lrm-refresh" or
@name="stonith-watchdog-timeout"
@name="stonith-watchdog-timeout" or
@name="fencing-watchdog-timeout"
)]'
environment:
CIB_file: "{{ __ha_cluster_tempfile_cib_xml.path }}"
Expand Down
15 changes: 15 additions & 0 deletions tasks/shell_pcs/sbd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,28 @@
== 'running' }}"
block:
- name: Set stonith-watchdog-timeout cluster property in CIB
# Original name of the cluster property is 'stonith-watchdog-timeout'. In
# pacemaker feature set 3.20.5 (at the time of writing this comment it
# hasn't been released in any pacemaker version yet), it was renamed to
# 'fencing-watchdog-timeout', while the original property is still kept
# as deprecated.
#
# Setting both properties is safe:
# - old pacemaker ignores the new property, no issues are caused by
# setting it
# - new pacemaker ignores the old property (if the new one is set), no
# issues are caused by setting it
# - both properties are set to the same value for the new pacemaker
# preventing inconsistencies
command:
cmd: >
pcs --force
{{
pacemaker_running | ternary('', '-f /var/lib/pacemaker/cib/cib.xml')
}}
-- property set
fencing-watchdog-timeout={{
ha_cluster_sbd_enabled | ternary('', '0') }}
stonith-watchdog-timeout={{
ha_cluster_sbd_enabled | ternary('', '0') }}
changed_when: true
Expand Down
2 changes: 1 addition & 1 deletion tests/tests_cib_acls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
debug:
var: __test_expected_lines | list

- name: Check node attributes configuration
- name: Check acl configuration
assert:
that:
- __test_pcs_acl_config.stdout_lines
Expand Down
2 changes: 0 additions & 2 deletions tests/tests_cib_constraints_create_and_load_info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,6 @@

- name: Fetch cluster versions of cluster components
include_tasks: tasks/fetch_versions.yml
vars:
with_cib_schema_version: true

- name: Create cluster, export it and check exported configuration
when:
Expand Down
4 changes: 2 additions & 2 deletions tests/tests_cib_properties_empty.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@

- name: Fetch versions of cluster components
include_tasks: tasks/fetch_versions.yml
vars:
with_cib_schema_version: true

- name: Fetch cluster properties configuration from the cluster
command:
Expand Down Expand Up @@ -64,6 +62,8 @@
ha_cluster_cluster_name: test-cluster
ha_cluster_cluster_properties:
- attrs:
- name: fencing-watchdog-timeout
value: "0"
- name: stonith-watchdog-timeout
value: "0"
ha_cluster_start_on_boot: true
Expand Down
2 changes: 2 additions & 0 deletions tests/tests_cib_properties_one_set.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@
ha_cluster_cluster_name: test-cluster
ha_cluster_cluster_properties:
- attrs:
- name: fencing-watchdog-timeout
value: "0"
- name: no-quorum-policy
value: stop
- name: stonith-enabled
Expand Down
2 changes: 2 additions & 0 deletions tests/tests_cib_rsc_op_defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@
ha_cluster_cluster_name: test-cluster
ha_cluster_cluster_properties:
- attrs:
- name: fencing-watchdog-timeout
value: "0"
- name: stonith-watchdog-timeout
value: "0"
ha_cluster_start_on_boot: true
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_cluster_advanced_knet_full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_cluster_advanced_knet_implicit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_cluster_advanced_udp_full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_cluster_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_cluster_basic_cloud_packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_cluster_basic_disabled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_export_doesnt_destroy_cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_export_firewall_selinux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
14 changes: 10 additions & 4 deletions tests/tests_pcs_permissions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,16 @@
{{
(__properties_capability in __test_pcs_capabilities) | ternary({
"ha_cluster_cluster_properties": [{
"attrs": [{
"name": "stonith-watchdog-timeout",
"value": "0"
}]
"attrs": [
{
"name": "fencing-watchdog-timeout",
"value": "0"
},
{
"name": "stonith-watchdog-timeout",
"value": "0"
},
]
}]
}, {})
}}
Expand Down
Loading