packages/pacemaker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!56 fix the validation function of input for IOwait

Browse Source 
From: @twtlpl 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
This commit is contained in:
openeuler-ci-bot 2023-11-28 12:02:45 +00:00 committed by Gitee
commit 0c73f7b1f2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fix-the-validation-function-of-input-for-IOWait.patch Normal file
View File

@ -0,0 +1,25 @@
From 7ad8f0c1375b4d18efc65ccf10d640a51b23828f Mon Sep 17 00:00:00 2001
From: liupei <liupei@kylinos.cn>
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

6
pacemaker.spec
View File

@ -17,7 +17,7 @@
## can be incremented to build packages reliably considered "newer" ## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion) ## than previously built packages with the same pcmkversion)
%global pcmkversion 2.1.6 %global pcmkversion 2.1.6
%global specversion 9 %global specversion 10
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
%global commit 6fdc9deea294bbad629b003c6ae036aaed8e3ee0 %global commit 6fdc9deea294bbad629b003c6ae036aaed8e3ee0
@ -159,6 +159,7 @@ Patch4: Refactor-fencer-sleep-1s-between-reconnects.patch
Patch5: Fix-the-validation-function-of-input.patch Patch5: Fix-the-validation-function-of-input.patch
Patch6: Fix-a-bug-in-clone-resource-description-display.patch Patch6: Fix-a-bug-in-clone-resource-description-display.patch
Patch7: Fix-controller-not-check-watchdog-fencing-status.patch Patch7: Fix-controller-not-check-watchdog-fencing-status.patch
Patch8: fix-the-validation-function-of-input-for-IOWait.patch
# upstream commits # upstream commits
Requires: resource-agents Requires: resource-agents
@ -778,6 +779,9 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING %license %{nagios_name}-%{nagios_hash}/COPYING
%changelog %changelog
* Tue Nov 28 2023 liupei <liupei@kylinos.cn> - 2.1.6-10
- fix the validation function of input for IOWait
* Wed Sep 6 2023 bizhiyuan <bizhiyuan@kylinos.cn> - 2.1.6-9 * Wed Sep 6 2023 bizhiyuan <bizhiyuan@kylinos.cn> - 2.1.6-9
- Fix: do not check whether watchdog fencing is enabled for the node if stonith-watchdog-timeout is not configured - Fix: do not check whether watchdog fencing is enabled for the node if stonith-watchdog-timeout is not configured