9135115e28
- There are some important fixes merged in mdadm upstream which should go with jsc#SLE-13700. This is the update from upstream mdadm including the important fixes we should have. - Detail: show correct raid level when the array is inactive (jsc#SLE-13700) 0095-Detail-show-correct-raid-level-when-the-array-is-ina.patch - Don't create bitmap for raid5 with journal disk (jsc#SLE-13700) 0096-Don-t-create-bitmap-for-raid5-with-journal-disk.patch - Monitor: refresh mdstat fd after select (jsc#SLE-13700) 0097-Monitor-refresh-mdstat-fd-after-select.patch - Monitor: stop notifing about containers. (jsc#SLE-13700) 0098-Monitor-stop-notifing-about-containers.patch - mdmonitor: set small delay once (jsc#SLE-13700) 0099-mdmonitor-set-small-delay-once.patch - Check if other Monitor instance running before fork. (jsc#SLE-13700) 0100-Check-if-other-Monitor-instance-running-before-fork.patch - Super1: allow RAID0 layout setting to be removed. (jsc#SLE-13700) 0101-Super1-allow-RAID0-layout-setting-to-be-removed.patch - Detail: fix segfault during IMSM raid creation (jsc#SLE-13700) 0102-Detail-fix-segfault-during-IMSM-raid-creation.patch - Create.c: close mdfd and generate uevent (jsc#SLE-13700) 0103-Create.c-close-mdfd-and-generate-uevent.patch - imsm: update num_data_stripes according to dev_size (jsc#SLE-13700) 0104-imsm-update-num_data_stripes-according-to-dev_size.patch - imsm: remove redundant calls to imsm_get_map (jsc#SLE-13700) OBS-URL: https://build.opensuse.org/request/show/853269 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=191
79 lines
2.2 KiB
Diff
79 lines
2.2 KiB
Diff
From 007087d0898a045901e4e120296e6d9b845b20a6 Mon Sep 17 00:00:00 2001
|
|
From: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>
|
|
Date: Wed, 9 Sep 2020 10:31:18 +0200
|
|
Subject: [PATCH 04/17] Monitor: stop notifing about containers.
|
|
|
|
Stop reporting any events from container but still track them,
|
|
it is important for spare migration.
|
|
Stop mdmonitor if no redundant array is presented in mdstat.
|
|
There is nothing to follow.
|
|
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
Monitor.c | 19 ++++++++++++++++---
|
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Monitor.c b/Monitor.c
|
|
index 80a3200..aed7a69 100644
|
|
--- a/Monitor.c
|
|
+++ b/Monitor.c
|
|
@@ -212,15 +212,24 @@ int Monitor(struct mddev_dev *devlist,
|
|
int new_found = 0;
|
|
struct state *st, **stp;
|
|
int anydegraded = 0;
|
|
+ int anyredundant = 0;
|
|
|
|
if (mdstat)
|
|
free_mdstat(mdstat);
|
|
mdstat = mdstat_read(oneshot ? 0 : 1, 0);
|
|
|
|
- for (st = statelist; st; st = st->next)
|
|
+ for (st = statelist; st; st = st->next) {
|
|
if (check_array(st, mdstat, c->test, &info,
|
|
increments, c->prefer))
|
|
anydegraded = 1;
|
|
+ /* for external arrays, metadata is filled for
|
|
+ * containers only
|
|
+ */
|
|
+ if (st->metadata && st->metadata->ss->external)
|
|
+ continue;
|
|
+ if (st->err == 0 && !anyredundant)
|
|
+ anyredundant = 1;
|
|
+ }
|
|
|
|
/* now check if there are any new devices found in mdstat */
|
|
if (c->scan)
|
|
@@ -236,6 +245,9 @@ int Monitor(struct mddev_dev *devlist,
|
|
if (!new_found) {
|
|
if (oneshot)
|
|
break;
|
|
+ else if (!anyredundant) {
|
|
+ break;
|
|
+ }
|
|
else {
|
|
mdstat_wait(c->delay);
|
|
mdstat_close();
|
|
@@ -542,7 +554,8 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
st->err = 0;
|
|
st->percent = RESYNC_NONE;
|
|
new_array = 1;
|
|
- alert("NewArray", st->devname, NULL, ainfo);
|
|
+ if (!is_container)
|
|
+ alert("NewArray", st->devname, NULL, ainfo);
|
|
}
|
|
|
|
if (st->utime == array.utime && st->failed == sra->array.failed_disks &&
|
|
@@ -676,7 +689,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
return retval;
|
|
|
|
disappeared:
|
|
- if (!st->err)
|
|
+ if (!st->err && !is_container)
|
|
alert("DeviceDisappeared", dev, NULL, ainfo);
|
|
st->err++;
|
|
goto out;
|
|
--
|
|
2.26.2
|
|
|