rpms/resource-agents
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- storage-mon: check if daemon is already running during start-action

Browse Source 
Resolves: RHEL-76037
This commit is contained in:
Oyvind Albrigtsen 2025-01-24 10:08:55 +01:00
parent 82f22cc405
commit 4cc212f304
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
RHEL-76037-4-storage-mon-check-if-daemon-is-already-running.patch Normal file
View File

@ -0,0 +1,25 @@
From c6f520344e830a7c946b2222f9f251be038b1b28 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Fri, 24 Jan 2025 10:01:30 +0100
Subject: [PATCH] storage-mon: check if daemon is already running during
start-action
---
heartbeat/storage-mon.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/heartbeat/storage-mon.in b/heartbeat/storage-mon.in
index 5edb96979..00e42f68d 100644
--- a/heartbeat/storage-mon.in
+++ b/heartbeat/storage-mon.in
@@ -311,6 +311,10 @@ storage_mon_start() {
fi
touch "${OCF_RESKEY_state_file}"
else
+ storage_mon_monitor pid_check_only
+ if [ $? -eq $OCF_SUCCESS ]; then
+ return $OCF_SUCCESS
+ fi
storage_mon_init
# generate command line
cmdline=""

12
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.16.0
Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -61,6 +61,7 @@ Patch8: RHEL-76007-Filesystem-dont-report-warnings-when-creating-resource.patch
Patch9: RHEL-76037-1-storage-mon-remove-unused-variables.patch
Patch10: RHEL-76037-2-storage-mon-fix-daemon-mode-bug-that-caused-delayed-initial-score.patch
Patch11: RHEL-76037-3-storage-mon-only-use-underscores-in-functions.patch
Patch12: RHEL-76037-4-storage-mon-check-if-daemon-is-already-running.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -229,6 +230,7 @@ exit 1
%patch -p1 -P 9
%patch -p1 -P 10
%patch -p1 -P 11
%patch -p1 -P 12
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -547,13 +549,17 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Fri Jan 24 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-4
- storage-mon: fix daemon mode bug that caused delayed initial score
Resolves: RHEL-76037
* Thu Jan 23 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-3
- openstack-cinder-volume: wait for volume to be available
- All agents: use grep -E/-F
- Filesystem: dont report warnings when creating resource
- storage-mon: fix daemon mode bug that caused delayed initial score
Resolves: RHEL-72954, RHEL-75574, RHEL-76007, RHEL-76037
Resolves: RHEL-72954, RHEL-75574, RHEL-76007
* Tue Nov 26 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-1
- Rebase to resource-agents 4.16.0 upstream release