From: NeilBrown <neilb@suse.de>
Date: Mon, 6 Jul 2015 03:26:41 +0000 (+1000)
Subject: Monitor: don't Wait forever on a 'frozen' array.
X-Git-Tag: mdadm-3.3.3~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3f6cf4f9bf670d36f51a8c0825755523fa6197c;p=thirdparty%2Fmdadm.git

Monitor: don't Wait forever on a 'frozen' array.

If Wait() finds the array resync is 'frozen', then wait
a little while to avoid races, but don't wait forever.

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

diff --git a/Monitor.c b/Monitor.c
index a5300329..f19c2e58 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -993,6 +993,7 @@ int Wait(char *dev)
 	struct stat stb;
 	char devnm[32];
 	int rv = 1;
+	int frozen_remaining = 3;
 
 	if (stat(dev, &stb) != 0) {
 		pr_err("Cannot find %s: %s\n", dev,
@@ -1009,7 +1010,7 @@ int Wait(char *dev)
 			if (strcmp(e->devnm, devnm) == 0)
 				break;
 
-		if (e->percent == RESYNC_NONE) {
+		if (e && e->percent == RESYNC_NONE) {
 			/* We could be in the brief pause before something
 			 * starts. /proc/mdstat doesn't show that, but
 			 * sync_action does.
@@ -1019,8 +1020,15 @@ int Wait(char *dev)
 			sysfs_init(&mdi, -1, devnm);
 			if (sysfs_get_str(&mdi, NULL, "sync_action",
 					  buf, 20) > 0 &&
-			    strcmp(buf,"idle\n") != 0)
+			    strcmp(buf,"idle\n") != 0) {
 				e->percent = RESYNC_UNKNOWN;
+				if (strcmp(buf, "frozen\n") == 0) {
+					if (frozen_remaining == 0)
+						e->percent = RESYNC_NONE;
+					else
+						frozen_remaining -= 1;
+				}
+			}
 		}
 		if (!e || e->percent == RESYNC_NONE) {
 			if (e && e->metadata_version &&