diff --git a/RHEL-76037-5-storage-mon-log-already-running-in-start-action.patch b/RHEL-76037-5-storage-mon-log-storage_mon-is-already-running-in-start-action.patch similarity index 65% rename from RHEL-76037-5-storage-mon-log-already-running-in-start-action.patch rename to RHEL-76037-5-storage-mon-log-storage_mon-is-already-running-in-start-action.patch index 9420c7b..f49311a 100644 --- a/RHEL-76037-5-storage-mon-log-already-running-in-start-action.patch +++ b/RHEL-76037-5-storage-mon-log-storage_mon-is-already-running-in-start-action.patch @@ -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 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 + 1 file changed, 1 insertion(+) 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 +++ b/heartbeat/storage-mon.in @@ -313,6 +313,7 @@ storage_mon_start() { else storage_mon_monitor pid_check_only 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 fi storage_mon_init diff --git a/resource-agents.spec b/resource-agents.spec index 24303b7..58f2584 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts 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 URL: https://github.com/ClusterLabs/resource-agents 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 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 -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 # bundled ha-cloud-support libs @@ -553,7 +553,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog -* Mon Jan 27 2025 Oyvind Albrigtsen - 4.16.0-6 +* Mon Jan 27 2025 Oyvind Albrigtsen - 4.16.0-7 - storage-mon: fix daemon mode bug that caused delayed initial score Resolves: RHEL-76037