1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 69d084784de196acec8ab703cd1b379af211d624 Mon Sep 17 00:00:00 2001
|
|
From: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
|
|
Date: Fri, 22 Feb 2019 10:15:45 +0100
|
|
Subject: [PATCH] mdmon: don't attempt to manage new arrays when terminating
|
|
Git-commit: 69d084784de196acec8ab703cd1b379af211d624
|
|
Patch-mainline: mdadm-4.1-12
|
|
References: bsc#1127526
|
|
|
|
When mdmon gets a SIGTERM, it stops managing arrays that are clean. If
|
|
there is more that one array in the container and one of them is dirty
|
|
and the clean one is still present in mdstat, mdmon will treat it as a
|
|
new array and start managing it again. This leads to a cycle of
|
|
remove_old() / manage_new() calls for the clean array, until the other
|
|
one also becomes clean.
|
|
|
|
Prevent this by not calling manage_new() if sigterm is set. Also, remove
|
|
a check for sigterm in manage_new() because the condition will never be
|
|
true.
|
|
|
|
Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
---
|
|
managemon.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/managemon.c b/managemon.c
|
|
index 101231c..29b91ba 100644
|
|
--- a/managemon.c
|
|
+++ b/managemon.c
|
|
@@ -727,9 +727,7 @@ static void manage_new(struct mdstat_ent *mdstat,
|
|
dprintf("inst: %s action: %d state: %d\n", inst,
|
|
new->action_fd, new->info.state_fd);
|
|
|
|
- if (sigterm)
|
|
- new->info.safe_mode_delay = 1;
|
|
- else if (mdi->safe_mode_delay >= 50)
|
|
+ if (mdi->safe_mode_delay >= 50)
|
|
/* Normal start, mdadm set this. */
|
|
new->info.safe_mode_delay = mdi->safe_mode_delay;
|
|
else
|
|
@@ -803,7 +801,7 @@ void manage(struct mdstat_ent *mdstat, struct supertype *container)
|
|
break;
|
|
}
|
|
}
|
|
- if (a == NULL || !a->container)
|
|
+ if ((a == NULL || !a->container) && !sigterm)
|
|
manage_new(mdstat, container, a);
|
|
}
|
|
}
|
|
--
|
|
2.16.4
|
|
|