diff --git a/fix-the-validation-function-of-input-for-IOWait.patch b/fix-the-validation-function-of-input-for-IOWait.patch new file mode 100644 index 0000000000000000000000000000000000000000..75e7c233049642a2490f01f024f73eb7e5f4df3c --- /dev/null +++ b/fix-the-validation-function-of-input-for-IOWait.patch @@ -0,0 +1,25 @@ +From 7ad8f0c1375b4d18efc65ccf10d640a51b23828f Mon Sep 17 00:00:00 2001 +From: liupei +Date: Tue, 28 Nov 2023 19:29:51 +0800 +Subject: [PATCH] fix the validation function of input for IOWait + +--- + agents/ocf/HealthIOWait.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agents/ocf/HealthIOWait.in b/agents/ocf/HealthIOWait.in +index ba7a17a..6bc568e 100644 +--- a/agents/ocf/HealthIOWait.in ++++ b/agents/ocf/HealthIOWait.in +@@ -181,7 +181,7 @@ meta-data) meta_data + ;; + start) agent_start;; + stop) agent_stop;; +-monitor) agent_monitor;; ++monitor) agent_validate && agent_monitor;; + validate-all) agent_validate;; + usage|help) agent_usage + exit $OCF_SUCCESS +-- +2.33.1.windows.1 + diff --git a/pacemaker.spec b/pacemaker.spec index 71d6bb29ddced96b936f54f2ebb32ccd1ec6182b..317b7a84567c7104a7aea88fdb80a6ab8a19c61f 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -17,7 +17,7 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 2.1.6 -%global specversion 9 +%global specversion 10 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build %global commit 6fdc9deea294bbad629b003c6ae036aaed8e3ee0 @@ -159,6 +159,7 @@ Patch4: Refactor-fencer-sleep-1s-between-reconnects.patch Patch5: Fix-the-validation-function-of-input.patch Patch6: Fix-a-bug-in-clone-resource-description-display.patch Patch7: Fix-controller-not-check-watchdog-fencing-status.patch +Patch8: fix-the-validation-function-of-input-for-IOWait.patch # upstream commits Requires: resource-agents @@ -778,6 +779,9 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Tue Nov 28 2023 liupei - 2.1.6-10 +- fix the validation function of input for IOWait + * Wed Sep 6 2023 bizhiyuan - 2.1.6-9 - Fix: do not check whether watchdog fencing is enabled for the node if stonith-watchdog-timeout is not configured