dcavalca / rpms / mdadm

Forked from rpms/mdadm 3 years ago
Clone

Blame SOURCES/0018-mdmon-don-t-attempt-to-manage-new-arrays-when-termin.patch

5d5466
From 69d084784de196acec8ab703cd1b379af211d624 Mon Sep 17 00:00:00 2001
5d5466
From: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
5d5466
Date: Fri, 22 Feb 2019 10:15:45 +0100
5d5466
Subject: [RHEL7.7 PATCH 18/24] mdmon: don't attempt to manage new arrays when
5d5466
 terminating
5d5466
5d5466
When mdmon gets a SIGTERM, it stops managing arrays that are clean. If
5d5466
there is more that one array in the container and one of them is dirty
5d5466
and the clean one is still present in mdstat, mdmon will treat it as a
5d5466
new array and start managing it again. This leads to a cycle of
5d5466
remove_old() / manage_new() calls for the clean array, until the other
5d5466
one also becomes clean.
5d5466
5d5466
Prevent this by not calling manage_new() if sigterm is set. Also, remove
5d5466
a check for sigterm in manage_new() because the condition will never be
5d5466
true.
5d5466
5d5466
Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
5d5466
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
5d5466
---
5d5466
 managemon.c | 6 ++----
5d5466
 1 file changed, 2 insertions(+), 4 deletions(-)
5d5466
5d5466
diff --git a/managemon.c b/managemon.c
5d5466
index 101231c..29b91ba 100644
5d5466
--- a/managemon.c
5d5466
+++ b/managemon.c
5d5466
@@ -727,9 +727,7 @@ static void manage_new(struct mdstat_ent *mdstat,
5d5466
 	dprintf("inst: %s action: %d state: %d\n", inst,
5d5466
 		new->action_fd, new->info.state_fd);
5d5466
 
5d5466
-	if (sigterm)
5d5466
-		new->info.safe_mode_delay = 1;
5d5466
-	else if (mdi->safe_mode_delay >= 50)
5d5466
+	if (mdi->safe_mode_delay >= 50)
5d5466
 		/* Normal start, mdadm set this. */
5d5466
 		new->info.safe_mode_delay = mdi->safe_mode_delay;
5d5466
 	else
5d5466
@@ -803,7 +801,7 @@ void manage(struct mdstat_ent *mdstat, struct supertype *container)
5d5466
 				break;
5d5466
 			}
5d5466
 		}
5d5466
-		if (a == NULL || !a->container)
5d5466
+		if ((a == NULL || !a->container) && !sigterm)
5d5466
 			manage_new(mdstat, container, a);
5d5466
 	}
5d5466
 }
5d5466
-- 
5d5466
2.7.5
5d5466