Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
NeilBrown 2013-07-02 13:09:07 +10:00
parent c39b2e633f
commit be7c26b48c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Assemble.c
View File

@ -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)

5
Grow.c
View File

@ -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 - "