From: NeilBrown <neilb@suse.de>
Date: Mon, 4 Jun 2012 02:52:36 +0000 (+1000)
Subject: Monitor: Report NewArray when an array the disappeared, reappears.
X-Git-Tag: mdadm-3.3-rc1~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f760384ebc92d81a988c1501e4a493ef064ad66;p=thirdparty%2Fmdadm.git

Monitor: Report NewArray when an array the disappeared, reappears.


Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Monitor.c b/Monitor.c
index d9295b52..b8e028ba 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -513,6 +513,13 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
 		 * just make sure it is always different. */
 		array.utime = st->utime + 1;;
 
+	if (st->err) {
+		/* New array appeared where previously had and error */
+		st->err = 0;
+		st->percent = RESYNC_NONE;
+		alert("NewArray", st->devname, NULL, ainfo);
+	}
+
 	if (st->utime == array.utime &&
 	    st->failed == array.failed_disks &&
 	    st->working == array.working_disks &&
@@ -521,7 +528,6 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
 		    mse->percent == st->percent
 		    ))) {
 		close(fd);
-		st->err = 0;
 		if ((st->active < st->raid) && st->spare == 0)
 			return 1;
 		else
@@ -714,7 +720,6 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
 			*statelist = st;
 			if (test)
 				alert("TestMessage", st->devname, NULL, info);
-			alert("NewArray", st->devname, NULL, info);
 			new_found = 1;
 		}
 	return new_found;