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

!51 [sync] PR-50: fix the validation function of input for HealthCPU

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
This commit is contained in:
openeuler-ci-bot 2023-09-01 00:59:41 +00:00 committed by Gitee
commit a8c29e7c48
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.patch Normal file
View File

@ -0,0 +1,25 @@
From 97f65bfa392b5663e023f5bee46697e778423b55 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Mon, 28 Aug 2023 17:02:22 +0800
Subject: [PATCH] fix the validation function of input
---
agents/ocf/HealthCPU.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/agents/ocf/HealthCPU.in b/agents/ocf/HealthCPU.in
index a852a7a..4bd6e36 100755
--- a/agents/ocf/HealthCPU.in
+++ b/agents/ocf/HealthCPU.in
@@ -207,7 +207,7 @@ meta-data) meta_data
;;
start) healthcpu_start;;
stop) healthcpu_stop;;
-monitor) healthcpu_monitor;;
+monitor) healthcpu_validate && healthcpu_monitor;;
reload-agent) healthcpu_reload_agent;;
validate-all) healthcpu_validate;;
usage|help) healthcpu_usage
--
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 6 %global specversion 7
## 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
@ -156,6 +156,7 @@ Patch1: 0001-Add-the-parameter-of-dampening-and-fix-attrd_updater.patch
Patch2: 0001-Add-the-parameter-of-dampening-and-fix-attrd_updater-HealthIOWait.patch Patch2: 0001-Add-the-parameter-of-dampening-and-fix-attrd_updater-HealthIOWait.patch
Patch3: Fix-libcrmcommon-wait-for-reply-from-appropriate-con.patch Patch3: Fix-libcrmcommon-wait-for-reply-from-appropriate-con.patch
Patch4: Refactor-fencer-sleep-1s-between-reconnects.patch Patch4: Refactor-fencer-sleep-1s-between-reconnects.patch
Patch5: Fix-the-validation-function-of-input.patch
# upstream commits # upstream commits
Requires: resource-agents Requires: resource-agents
@ -775,6 +776,9 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING %license %{nagios_name}-%{nagios_hash}/COPYING
%changelog %changelog
* Thu Aug 31 2023 liupei <liupei@kylinos.cn> -2.1.6-7
- Fix the validation function of input for HealthCPU
* Thu Aug 31 2023 bizhiyuan <bizhiyuan@kylinos.cn> - 2.1.6-6 * Thu Aug 31 2023 bizhiyuan <bizhiyuan@kylinos.cn> - 2.1.6-6
- Refactor: fencer: sleep 1s between reconnects - Refactor: fencer: sleep 1s between reconnects