From: NeilBrown <neilb@suse.de>
Date: Tue, 2 Jul 2013 03:09:07 +0000 (+1000)
Subject: Assemble: improve messages when restarting a reshape.
X-Git-Tag: mdadm-3.3-rc2~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be7c26b48cccfa9897fcbfc127d8bb2313ccb9c4;p=thirdparty%2Fmdadm.git

Assemble: improve messages when restarting a reshape.

If the restarted reshape needs a backup file and we don't have one,
that should be reported before we try to start the array.
Also we shouldn't say the "Cannot grow" but "cannot complete".

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

diff --git a/Assemble.c b/Assemble.c
index afe5b050..294c9926 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1007,6 +1007,15 @@ static int start_array(int mdfd,
 		if (content->reshape_active &&
 		    !(content->reshape_active & RESHAPE_NO_BACKUP) &&
 		    content->delta_disks <= 0) {
+			if (!c->backup_file) {
+				pr_err("%s: Need a backup file to complete reshape of this array.\n",
+				       mddev);
+				pr_err("Please provided one with \"--backup-file=...\"\n");
+				if (c->update &&
+				    strcmp(c->update, "revert-reshape") == 0)
+					pr_err("(Don't specify --update=revert-reshape again, that part succeeded.)\n");
+				return 1;
+			}
 			rv = sysfs_set_str(content, NULL,
 					   "array_state", "readonly");
 			if (rv == 0)
diff --git a/Grow.c b/Grow.c
index e27d29ff..8ca57e84 100644
--- a/Grow.c
+++ b/Grow.c
@@ -3143,8 +3143,9 @@ started:
 		if (backup_file == NULL) {
 			if (reshape.after.data_disks <=
 			    reshape.before.data_disks) {
-				pr_err("%s: Cannot grow - "
-					"need backup-file\n", devname);
+				pr_err("%s: Cannot grow - need backup-file\n",
+				       devname);
+				pr_err(" Please provide one with \"--backup=...\"\n");
 				goto release;
 			} else if (sra->array.spare_disks == 0) {
 				pr_err("%s: Cannot grow - "