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

- storage-mon: add daemon-mode to deal with I/O hangs

Browse Source 
Resolves: RHEL-979
This commit is contained in:
Oyvind Albrigtsen 2023-10-02 10:05:06 +02:00
parent de4c764374
commit a5424dcb1b
3 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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.10.0 Version: 4.10.0
Release: 44%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} Release: 45%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
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
@ -109,8 +109,9 @@ Patch56: bz2207567-Filesystem-2-fix-incorrect-parameter-types.patch
Patch57: bz2209433-Delay-1-increase-default-timeouts.patch Patch57: bz2209433-Delay-1-increase-default-timeouts.patch
Patch58: bz2209433-Delay-2-remove-incorrect-statement.patch Patch58: bz2209433-Delay-2-remove-incorrect-statement.patch
Patch59: bz2207567-Filesystem-3-fix-signal_delay-default-value.patch Patch59: bz2207567-Filesystem-3-fix-signal_delay-default-value.patch
Patch60: rhel-979-storage-mon-daemon-mode.patch Patch60: bz2110038-mysql-common-improve-error-message.patch
Patch61: bz2110038-mysql-common-improve-error-message.patch Patch61: rhel-979-storage-mon-1-daemon-mode.patch
Patch62: rhel-979-storage-mon-2-remove-unnecessary-code.patch
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
Patch500: ha-cloud-support-aws.patch Patch500: ha-cloud-support-aws.patch
@ -296,6 +297,7 @@ exit 1
%patch -p1 -P 59 %patch -p1 -P 59
%patch -p1 -P 60 %patch -p1 -P 60
%patch -p1 -P 61 %patch -p1 -P 61
%patch -p1 -P 62
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
%patch -p1 -P 500 %patch -p1 -P 500
@ -617,11 +619,15 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog %changelog
* Wed Sep 6 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-44 * Wed Sep 6 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-45
- storage-mon: add daemon-mode to deal with I/O hangs - storage-mon: add daemon-mode to deal with I/O hangs
Resolves: RHEL-979
* Wed Sep 6 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-44
- mysql-common: improve error message - mysql-common: improve error message
Resolves: RHEL-979, rhbz#2110038 Resolves: rhbz#2110038
* Thu Jul 20 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-43 * Thu Jul 20 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-43
- Filesystem: improve stop-action and allow setting term/kill signals - Filesystem: improve stop-action and allow setting term/kill signals

0
rhel-979-storage-mon-daemon-mode.patch → rhel-979-storage-mon-1-daemon-mode.patch
View File

36
rhel-979-storage-mon-2-remove-unnecessary-code.patch Normal file
View File

@ -0,0 +1,36 @@
From c3c1f1a3005f6a6d3d03d6bf0f0ac7605838146f Mon Sep 17 00:00:00 2001
From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
Date: Tue, 26 Sep 2023 14:02:39 +0900
Subject: [PATCH] Low: storage-mon: Remove unnecessary code and fix typos.
---
tools/storage_mon.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/tools/storage_mon.c b/tools/storage_mon.c
index 1231570c8..1aae29e58 100644
--- a/tools/storage_mon.c
+++ b/tools/storage_mon.c
@@ -318,12 +318,7 @@ static int32_t sigchld_handler(int32_t sig, void *data)
daemon_check_first_all_devices = TRUE;
}
}
-#if 0
- if (shutting_down == FALSE) {
- finished_count++;
- test_forks[index] = 0;
- }
-#endif
+
finished_count++;
test_forks[index] = 0;
@@ -521,7 +516,7 @@ static int test_device_main(gpointer data)
}
}
} else {
- /* Rrun the child process timeout watch timer. */
+ /* Run the child process timeout watch timer. */
qb_loop_timer_add(storage_mon_poll_handle, QB_LOOP_MED, timeout * QB_TIME_NS_IN_SEC, NULL, child_timeout_handler, &expire_handle);
}
}