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

Assemble: Handle assembling from config file which is out of order. 

Currently "mdadm -As" will process the entries in the config
file in order.  If any array is a component or member of a preceding
array, that array will not be assembled.

So if there are any failures during assembly, retry those arrays,
and look until everything is assembled, or nothing more can
be assembled.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2010-02-24 11:16:41 +11:00
parent cd9a8b5cb4
commit b179246f4f
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mdadm.c
View File

@ -1120,9 +1120,10 @@ int main(int argc, char *argv[])
verbose-quiet, force);
}
} else {
mddev_ident_t array_list = conf_get_ident(NULL);
mddev_ident_t a, array_list = conf_get_ident(NULL);
mddev_dev_t devlist = conf_get_devs();
int cnt = 0;
int failures, successes;
if (devlist == NULL) {
fprintf(stderr, Name ": No devices listed in conf file were found.\n");
exit(1);
@ -1135,21 +1136,38 @@ int main(int argc, char *argv[])
fprintf(stderr, Name ": --backup_file not meaningful with a --scan assembly.\n");
exit(1);
}
for (; array_list; array_list = array_list->next) {
if (array_list->devname &&
strcasecmp(array_list->devname, "<ignore>") == 0)
continue;
if (array_list->autof == 0)
array_list->autof = autof;
rv |= Assemble(ss, array_list->devname,
array_list,
NULL, NULL,
readonly, runstop, NULL,
homehost, require_homehost,
verbose-quiet, force);
cnt++;
for (a = array_list; a ; a = a->next) {
a->assembled = 0;
if (a->autof == 0)
a->autof = autof;
}
do {
failures = 0;
successes = 0;
rv = 0;
for (a = array_list; a ; a = a->next) {
int r;
if (a->assembled)
continue;
if (a->devname &&
strcasecmp(a->devname, "<ignore>") == 0)
continue;
r = Assemble(ss, a->devname,
a,
NULL, NULL,
readonly, runstop, NULL,
homehost, require_homehost,
verbose-quiet, force);
if (r == 0) {
a->assembled = 1;
successes++;
} else
failures++;
rv |= r;
cnt++;
}
} while (failures && successes);
if (homehost && cnt == 0) {
/* Maybe we can auto-assemble something.
* Repeatedly call Assemble in auto-assemble mode

4
mdadm.h
View File

@ -301,6 +301,10 @@ typedef struct mddev_ident_s {
char *member; /* subarray within a container */
struct mddev_ident_s *next;
union {
/* fields needed by different users of this structure */
int assembled; /* set when assembly succeeds */
};
} *mddev_ident_t;
/* List of device names - wildcards expanded */