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

- storage-mon: log "storage_mon is already running" in start-action

Browse Source 
Resolves: RHEL-76037
This commit is contained in:
Oyvind Albrigtsen 2025-01-27 12:48:29 +01:00
parent 8894ec0ca8
commit a76e865811
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RHEL-76037-5-storage-mon-log-already-running-in-start-action.patch → RHEL-76037-5-storage-mon-log-storage_mon-is-already-running-in-start-action.patch
View File

@ -1,21 +1,22 @@
From 761055993a3839c9ec0edb2bb9ba294e40c1626b Mon Sep 17 00:00:00 2001 From de51a1705ce761f1fb5f1b2294cfc1153af70c1c Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com> From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 27 Jan 2025 09:54:06 +0100 Date: Mon, 27 Jan 2025 09:54:06 +0100
Subject: [PATCH] storage-mon: log "already running" in start-action Subject: [PATCH] storage-mon: log "storage_mon is already running" in
start-action
--- ---
heartbeat/storage-mon.in | 1 + heartbeat/storage-mon.in | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/heartbeat/storage-mon.in b/heartbeat/storage-mon.in diff --git a/heartbeat/storage-mon.in b/heartbeat/storage-mon.in
index 00e42f68d..f6a372ac8 100644 index 00e42f68d..d60db4ad4 100644
--- a/heartbeat/storage-mon.in --- a/heartbeat/storage-mon.in
+++ b/heartbeat/storage-mon.in +++ b/heartbeat/storage-mon.in
@@ -313,6 +313,7 @@ storage_mon_start() { @@ -313,6 +313,7 @@ storage_mon_start() {
else else
storage_mon_monitor pid_check_only storage_mon_monitor pid_check_only
if [ $? -eq $OCF_SUCCESS ]; then if [ $? -eq $OCF_SUCCESS ]; then
+ ocf_log info "storage-mon is already running. PID=`cat $PIDFILE`" + ocf_log info "storage_mon is already running. PID=`cat $PIDFILE`"
return $OCF_SUCCESS return $OCF_SUCCESS
fi fi
storage_mon_init storage_mon_init

6
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.16.0 Version: 4.16.0
Release: 6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} Release: 7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://github.com/ClusterLabs/resource-agents URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -62,7 +62,7 @@ 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 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 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 Patch12: RHEL-76037-4-storage-mon-check-if-daemon-is-already-running.patch
Patch13: RHEL-76037-5-storage-mon-log-already-running-in-start-action.patch Patch13: RHEL-76037-5-storage-mon-log-storage_mon-is-already-running-in-start-action.patch
Patch14: RHEL-73689-ocf-shellfuncs-fix-syntax-error-in-crm_mon_no_validation.patch Patch14: RHEL-73689-ocf-shellfuncs-fix-syntax-error-in-crm_mon_no_validation.patch
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
@ -553,7 +553,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog %changelog
* Mon Jan 27 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-6 * Mon Jan 27 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-7
- storage-mon: fix daemon mode bug that caused delayed initial score - storage-mon: fix daemon mode bug that caused delayed initial score
Resolves: RHEL-76037 Resolves: RHEL-76037