/*
* mdadm - manage Linux "md" devices aka RAID arrays.
*
- * Copyright (C) 2001-2009 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
*
*
* This program is free software; you can redistribute it and/or modify
static int is_member_busy(char *metadata_version)
{
/* check if the given member array is active */
- struct mdstat_ent *mdstat = mdstat_read(1, 0);
+ struct mdstat_ent *mdstat = mdstat_read(0, 0);
struct mdstat_ent *ent;
int busy = 0;
return 0;
}
if (ident->raid_disks != UnSet &&
+ content->array.raid_disks != 0 && /* metadata doesn't know how many to expect */
ident->raid_disks!= content->array.raid_disks) {
if (devname)
pr_err("%s requires wrong number of drives.\n",
struct mdinfo **contentp,
struct context *c,
int inargv, int auto_assem)
-
{
struct mddev_dev *tmpdev;
int num_devs;
struct supertype *st = *stp;
struct mdinfo *content = NULL;
- int report_missmatch = ((inargv && c->verbose >= 0) || c->verbose > 0);
+ int report_mismatch = ((inargv && c->verbose >= 0) || c->verbose > 0);
struct domainlist *domains = NULL;
tmpdev = devlist; num_devs = 0;
if (tmpdev->used > 1)
continue;
- if (ident->devices &&
- !match_oneof(ident->devices, devname)) {
- if (report_missmatch)
+ if (ident->container) {
+ if (ident->container[0] == '/' &&
+ !same_dev(ident->container, devname)) {
+ if (report_mismatch)
+ pr_err("%s is not the container required (%s)\n",
+ devname, ident->container);
+ continue;
+ }
+ } else if (ident->devices &&
+ !match_oneof(ident->devices, devname)) {
+ /* Note that we ignore the "device=" identifier if a
+ * "container=" is given. Checking both is unnecessarily
+ * complicated.
+ */
+ if (report_mismatch)
pr_err("%s is not one of %s\n", devname, ident->devices);
continue;
}
dfd = dev_open(devname, O_RDONLY);
if (dfd < 0) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("cannot open device %s: %s\n",
devname, strerror(errno));
tmpdev->used = 2;
/* already found some components, this cannot
* be another one.
*/
- if (report_missmatch)
+ if (report_mismatch)
pr_err("%s is a container, but we are looking for components\n",
devname);
tmpdev->used = 2;
#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
} if (!tst && (tst = super_by_fd(dfd, NULL)) == NULL) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("not a recognisable container: %s\n",
devname);
tmpdev->used = 2;
#endif
} else if (!tst->ss->load_container
|| tst->ss->load_container(tst, dfd, NULL)) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("no correct container type: %s\n",
devname);
tmpdev->used = 2;
} else if (auto_assem &&
- !conf_test_metadata(tst->ss->name, (pol = devnum_policy(stb.st_rdev)),
+ !conf_test_metadata(tst->ss->name, (pol = devid_policy(stb.st_rdev)),
tst->ss->match_home(tst, c->homehost) == 1)) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("%s has metadata type %s for which "
"auto-assembly is disabled\n",
devname, tst->ss->name);
found_container = 1;
} else {
if (!tst && (tst = guess_super(dfd)) == NULL) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("no recogniseable superblock on %s\n",
devname);
tmpdev->used = 2;
} else if (tst->ss->load_super(tst,dfd, NULL)) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("no RAID superblock on %s\n",
devname);
tmpdev->used = 2;
} else if (tst->ss->compare_super == NULL) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("Cannot assemble %s metadata on %s\n",
tst->ss->name, devname);
tmpdev->used = 2;
} else if (auto_assem && st == NULL &&
- !conf_test_metadata(tst->ss->name, (pol = devnum_policy(stb.st_rdev)),
+ !conf_test_metadata(tst->ss->name, (pol = devid_policy(stb.st_rdev)),
tst->ss->match_home(tst, c->homehost) == 1)) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("%s has metadata type %s for which "
"auto-assembly is disabled\n",
devname, tst->ss->name);
goto loop;
pr_err("%s has no superblock - assembly aborted\n",
- devname);
+ devname);
if (st)
st->ss->free_super(st);
dev_policy_free(pol);
*/
dfd = dev_open(devname, O_RDONLY | O_EXCL);
if (dfd < 0) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("%s is busy - skipping\n", devname);
goto loop;
}
close(dfd);
- if (ident->container) {
- if (ident->container[0] == '/' &&
- !same_dev(ident->container, devname)) {
- if (report_missmatch)
- pr_err("%s is not the container required (%s)\n",
- devname, ident->container);
+ if (ident->container && ident->container[0] != '/') {
+ /* we have a uuid */
+ int uuid[4];
+
+ content = *contentp;
+ tst->ss->getinfo_super(tst, content, NULL);
+
+ if (!parse_uuid(ident->container, uuid) ||
+ !same_uuid(content->uuid, uuid, tst->ss->swapuuid)) {
+ if (report_mismatch)
+ pr_err("%s has wrong UUID to be required container\n",
+ devname);
goto loop;
}
- if (ident->container[0] != '/') {
- /* we have a uuid */
- int uuid[4];
-
- content = *contentp;
- tst->ss->getinfo_super(tst, content, NULL);
-
- if (!parse_uuid(ident->container, uuid) ||
- !same_uuid(content->uuid, uuid, tst->ss->swapuuid)) {
- if (report_missmatch)
- pr_err("%s has wrong UUID to be required container\n",
- devname);
- goto loop;
- }
- }
}
/* It is worth looking inside this container.
*/
if (c->verbose > 0)
pr_err("looking in container %s\n",
- devname);
+ devname);
for (content = tst->ss->container_content(tst, NULL);
content;
if (!ident_matches(ident, content, tst,
c->homehost, c->update,
- report_missmatch ? devname : NULL))
+ report_mismatch ? devname : NULL))
/* message already printed */;
else if (is_member_busy(content->text_version)) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("member %s in %s is already assembled\n",
- content->text_version,
- devname);
+ content->text_version,
+ devname);
} else if (content->array.state & (1<<MD_SB_BLOCK_VOLUME)) {
/* do not assemble arrays with unsupported configurations */
pr_err("Cannot activate member %s in %s.\n",
- content->text_version,
- devname);
+ content->text_version,
+ devname);
} else
break;
}
st = tst; tst = NULL;
if (!auto_assem && inargv && tmpdev->next != NULL) {
pr_err("%s is a container, but is not "
- "only device given: confused and aborting\n",
- devname);
+ "only device given: confused and aborting\n",
+ devname);
st->ss->free_super(st);
dev_policy_free(pol);
domain_free(domains);
}
if (c->verbose > 0)
pr_err("found match on member %s in %s\n",
- content->text_version, devname);
+ content->text_version, devname);
/* make sure we finished the loop */
tmpdev = NULL;
goto loop;
} else {
+ int rv = 0;
+ struct mddev_ident *match;
content = *contentp;
tst->ss->getinfo_super(tst, content, NULL);
if (!ident_matches(ident, content, tst,
c->homehost, c->update,
- report_missmatch ? devname : NULL))
+ report_mismatch ? devname : NULL))
+ goto loop;
+
+ match = conf_match(tst, content, devname,
+ report_mismatch ? c->verbose : -1,
+ &rv);
+ if (!match && rv == 2)
goto loop;
-
+ if (match && match->devname &&
+ strcasecmp(match->devname, "<ignore>") == 0) {
+ if (report_mismatch)
+ pr_err("%s is a member of an explicitly ignored array\n",
+ devname);
+ goto loop;
+ }
+ if (match && !ident_matches(match, content, tst,
+ c->homehost, c->update,
+ report_mismatch ? devname : NULL))
+ /* Array exists in mdadm.conf but some
+ * details don't match, so reject it
+ */
+ goto loop;
+
/* should be safe to try an exclusive open now, we
* have rejected anything that some other mdadm might
* be looking at
*/
dfd = dev_open(devname, O_RDONLY | O_EXCL);
if (dfd < 0) {
- if (report_missmatch)
+ if (report_mismatch)
pr_err("%s is busy - skipping\n", devname);
goto loop;
}
(first == 1 || last == 1)) {
/* We can do something */
if (first) {/* just ignore this one */
- if (report_missmatch)
+ if (report_mismatch)
pr_err("%s misses out due to wrong homehost\n",
- devname);
+ devname);
goto loop;
} else { /* reject all those sofar */
struct mddev_dev *td;
- if (report_missmatch)
+ if (report_mismatch)
pr_err("%s overrides previous devices due to good homehost\n",
- devname);
+ devname);
for (td=devlist; td != tmpdev; td=td->next)
if (td->used == 1)
td->used = 0;
}
}
pr_err("superblock on %s doesn't match others - assembly aborted\n",
- devname);
+ devname);
tst->ss->free_super(tst);
st->ss->free_super(st);
dev_policy_free(pol);
/* Collect domain information from members only */
if (tmpdev && tmpdev->used == 1) {
if (!pol)
- pol = devnum_policy(stb.st_rdev);
+ pol = devid_policy(stb.st_rdev);
domain_merge(&domains, pol, tst?tst->ss->name:NULL);
}
dev_policy_free(pol);
continue;
if (stat(tmpdev->devname, &stb)< 0) {
pr_err("fstat failed for %s: %s\n",
- tmpdev->devname, strerror(errno));
+ tmpdev->devname, strerror(errno));
tmpdev->used = 2;
} else {
- struct dev_policy *pol = devnum_policy(stb.st_rdev);
+ struct dev_policy *pol = devid_policy(stb.st_rdev);
int dt = domain_test(domains, pol, NULL);
if (inargv && dt != 0)
/* take this spare as domains match
};
static int load_devices(struct devs *devices, char *devmap,
- struct mddev_ident *ident, struct supertype *st,
+ struct mddev_ident *ident, struct supertype **stp,
struct mddev_dev *devlist, struct context *c,
struct mdinfo *content,
int mdfd, char *mddev,
#ifndef MDASSEMBLE
int bitmap_done = 0;
#endif
- int most_recent = 0;
+ int most_recent = -1;
int bestcnt = 0;
int *best = *bestp;
+ struct supertype *st = *stp;
for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) {
char *devname = tmpdev->devname;
struct stat stb;
+ struct supertype *tst;
int i;
if (tmpdev->used != 1)
int dfd;
/* prepare useful information in info structures */
struct stat stb2;
- struct supertype *tst;
int err;
fstat(mdfd, &stb2);
close(mdfd);
free(devices);
free(devmap);
+ tst->ss->free_super(tst);
+ free(tst);
+ *stp = st;
return -1;
}
tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks);
ident->uuid_set,
c->homehost);
if (err < 0) {
- pr_err("--update=%s not understood"
- " for %s metadata\n",
- c->update, tst->ss->name);
+ if (err == -1)
+ pr_err("--update=%s not understood"
+ " for %s metadata\n",
+ c->update, tst->ss->name);
tst->ss->free_super(tst);
free(tst);
close(mdfd);
close(dfd);
free(devices);
free(devmap);
+ *stp = st;
return -1;
}
if (strcmp(c->update, "uuid")==0 &&
else
bitmap_done = 1;
}
- tst->ss->free_super(tst);
} else
#endif
{
- struct supertype *tst = dup_super(st);
- int dfd;
- dfd = dev_open(devname,
- tmpdev->disposition == 'I'
- ? O_RDWR : (O_RDWR|O_EXCL));
+ int dfd = dev_open(devname,
+ tmpdev->disposition == 'I'
+ ? O_RDWR : (O_RDWR|O_EXCL));
+ tst = dup_super(st);
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
pr_err("cannot re-read metadata from %s - aborting\n",
close(mdfd);
free(devices);
free(devmap);
+ tst->ss->free_super(tst);
+ free(tst);
+ *stp = st;
return -1;
}
tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks);
- tst->ss->free_super(tst);
close(dfd);
}
stat(devname, &stb);
if (c->verbose > 0)
- pr_err("%s is identified as a member of %s, slot %d.\n",
- devname, mddev, content->disk.raid_disk);
+ pr_err("%s is identified as a member of %s, slot %d%s.\n",
+ devname, mddev, content->disk.raid_disk,
+ (content->disk.state & (1<<MD_DISK_REPLACEMENT)) ? " replacement":"");
devices[devcnt].devname = devname;
devices[devcnt].uptodate = 0;
devices[devcnt].included = (tmpdev->disposition == 'I');
devices[devcnt].i = *content;
devices[devcnt].i.disk.major = major(stb.st_rdev);
devices[devcnt].i.disk.minor = minor(stb.st_rdev);
- if (most_recent < devcnt) {
- if (devices[devcnt].i.events
- > devices[most_recent].i.events)
+
+ if (devices[devcnt].i.disk.state == 6) {
+ if (most_recent < 0 ||
+ devices[devcnt].i.events
+ > devices[most_recent].i.events) {
+ struct supertype *tmp = tst;
+ tst = st;
+ st = tmp;
most_recent = devcnt;
+ }
}
+ tst->ss->free_super(tst);
+ free(tst);
+
if (content->array.level == LEVEL_MULTIPATH)
/* with multipath, the raid_disk from the superblock is meaningless */
i = devcnt;
else
i = devices[devcnt].i.disk.raid_disk;
if (i+1 == 0) {
- if (nextspare < content->array.raid_disks)
- nextspare = content->array.raid_disks;
+ if (nextspare < content->array.raid_disks*2)
+ nextspare = content->array.raid_disks*2;
i = nextspare++;
} else {
- if (i >= content->array.raid_disks &&
+ /* i is raid_disk - double it so there is room for
+ * replacements */
+ i *= 2;
+ if (devices[devcnt].i.disk.state & (1<<MD_DISK_REPLACEMENT))
+ i++;
+ if (i >= content->array.raid_disks*2 &&
i >= nextspare)
nextspare = i+1;
}
close(mdfd);
free(devices);
free(devmap);
+ *stp = st;
return -1;
}
if (best[i] == -1
}
devcnt++;
}
- *most_recentp = most_recent;
+ if (most_recent >= 0)
+ *most_recentp = most_recent;
*bestcntp = bestcnt;
*bestp = best;
+ *stp = st;
return devcnt;
}
int chosen_drive = -1;
int i;
- for (i = 0; i < content->array.raid_disks && i < bestcnt; i++) {
+ for (i = 0;
+ i < content->array.raid_disks * 2 && i < bestcnt;
+ i += 2) {
int j = best[i];
if (j>=0 &&
!devices[j].uptodate &&
add_another:
if (c->verbose >= 0)
pr_err("forcing event count in %s(%d) from %d upto %d\n",
- devices[chosen_drive].devname,
- devices[chosen_drive].i.disk.raid_disk,
- (int)(devices[chosen_drive].i.events),
- (int)(devices[most_recent].i.events));
+ devices[chosen_drive].devname,
+ devices[chosen_drive].i.disk.raid_disk,
+ (int)(devices[chosen_drive].i.events),
+ (int)(devices[most_recent].i.events));
fd = dev_open(devices[chosen_drive].devname,
devices[chosen_drive].included ? O_RDWR
: (O_RDWR|O_EXCL));
if (fd < 0) {
pr_err("Couldn't open %s for write - not updating\n",
- devices[chosen_drive].devname);
+ devices[chosen_drive].devname);
devices[chosen_drive].i.events = 0;
continue;
}
if (tst->ss->load_super(tst,fd, NULL)) {
close(fd);
pr_err("RAID superblock disappeared from %s - not updating.\n",
- devices[chosen_drive].devname);
+ devices[chosen_drive].devname);
devices[chosen_drive].i.events = 0;
continue;
}
content->events = devices[most_recent].i.events;
tst->ss->update_super(tst, content, "force-one",
- devices[chosen_drive].devname, c->verbose,
- 0, NULL);
+ devices[chosen_drive].devname, c->verbose,
+ 0, NULL);
if (tst->ss->store_super(tst, fd)) {
close(fd);
pr_err("Could not re-write superblock on %s\n",
- devices[chosen_drive].devname);
+ devices[chosen_drive].devname);
devices[chosen_drive].i.events = 0;
tst->ss->free_super(tst);
continue;
/* If there are any other drives of the same vintage,
* add them in as well. We can't lose and we might gain
*/
- for (i = 0; i < content->array.raid_disks && i < bestcnt ; i++) {
+ for (i = 0;
+ i < content->array.raid_disks * 2 && i < bestcnt ;
+ i += 2) {
int j = best[i];
if (j >= 0 &&
!devices[j].uptodate &&
unsigned int rebuilding_cnt,
struct context *c,
int clean, char *avail,
- int start_partial_ok
+ int start_partial_ok,
+ int err_ok,
+ int was_forced
)
{
int rv;
unsigned int req_cnt;
rv = set_array_info(mdfd, st, content);
- if (rv) {
+ if (rv && !err_ok) {
pr_err("failed to set array info for %s: %s\n",
mddev, strerror(errno));
return 1;
devices[j].devname,
mddev,
strerror(errno));
- if (i < content->array.raid_disks
+ if (i < content->array.raid_disks * 2
|| i == bestcnt)
okcnt--;
else
sparecnt--;
} else if (c->verbose > 0)
- pr_err("added %s to %s as %d%s\n",
+ pr_err("added %s to %s as %d%s%s\n",
devices[j].devname, mddev,
devices[j].i.disk.raid_disk,
devices[j].uptodate?"":
- " (possibly out of date)");
+ " (possibly out of date)",
+ (devices[j].i.disk.state & (1<<MD_DISK_REPLACEMENT))?" replacement":"");
} else if (j >= 0) {
if (c->verbose > 0)
pr_err("%s is already in %s as %d\n",
devices[j].devname, mddev,
devices[j].i.disk.raid_disk);
- } else if (c->verbose > 0 && i < content->array.raid_disks)
+ } else if (c->verbose > 0 && i < content->array.raid_disks*2
+ && (i&1) == 0)
pr_err("no uptodate device for slot %d of %s\n",
i, mddev);
}
}
st->ss->free_super(st);
sysfs_uevent(content, "change");
+ if (err_ok && okcnt < (unsigned)content->array.raid_disks)
+ /* Was partial, is still partial, so signal an error
+ * to ensure we don't retry */
+ return 1;
return 0;
}
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)
} else
#endif
rv = ioctl(mdfd, RUN_ARRAY, NULL);
+ reopen_mddev(mdfd); /* drop O_EXCL */
if (rv == 0) {
if (c->verbose >= 0) {
pr_err("%s has been started with %d drive%s",
* of the stripe cache - default is 256
*/
if (256 < 4 * (content->array.chunk_size/4096)) {
- struct mdinfo *sra = sysfs_read(mdfd, 0, 0);
+ struct mdinfo *sra = sysfs_read(mdfd, NULL, 0);
if (sra)
sysfs_set_num(sra, NULL,
"stripe_cache_size",
}
}
}
+ if (content->array.level == 6 &&
+ okcnt + 1 == (unsigned)content->array.raid_disks &&
+ was_forced) {
+ struct mdinfo *sra = sysfs_read(mdfd, NULL, 0);
+ if (sra)
+ sysfs_set_str(sra, NULL,
+ "sync_action", "repair");
+ sysfs_free(sra);
+ }
return 0;
}
pr_err("failed to RUN_ARRAY %s: %s\n",
if (c->verbose >= -1) {
pr_err("%s assembled from %d drive%s", mddev, okcnt, okcnt==1?"":"s");
if (rebuilding_cnt)
- fprintf(stderr, "%s %d rebuilding", sparecnt?", ":" and ", rebuilding_cnt);
+ fprintf(stderr, "%s %d rebuilding", sparecnt?",":" and", rebuilding_cnt);
if (sparecnt)
fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
if (!enough(content->array.level, content->array.raid_disks,
if (req_cnt == (unsigned)content->array.raid_disks)
fprintf(stderr, " - need all %d to start it", req_cnt);
else
- fprintf(stderr, " - need %d of %d to start", req_cnt, content->array.raid_disks);
+ fprintf(stderr, " - need %d to start", req_cnt);
fprintf(stderr, " (use --run to insist).\n");
}
}
int *best = NULL; /* indexed by raid_disk */
int bestcnt = 0;
int devcnt;
- unsigned int okcnt, sparecnt, rebuilding_cnt;
+ unsigned int okcnt, sparecnt, rebuilding_cnt, replcnt;
int i;
+ int was_forced = 0;
int most_recent = 0;
int chosen_drive;
int change = 0;
else if (mddev)
inargv = 1;
- try_again:
+try_again:
/* We come back here when doing auto-assembly and attempting some
* set of devices failed. Those are now marked as ->used==2 and
* we ignore them and try again
mddev ? mddev : "further assembly");
content = &info;
+ if (st)
+ st->ignore_hw_compat = 1;
num_devs = select_devices(devlist, ident, &st, &content, c,
inargv, auto_assem);
if (num_devs < 0)
return 1;
-
+
if (!st || !st->sb || !content)
return 2;
if (mp) {
struct mdinfo *dv;
/* array already exists. */
- pre_exist = sysfs_read(-1, mp->devnum, GET_LEVEL|GET_DEVS);
+ pre_exist = sysfs_read(-1, mp->devnm, GET_LEVEL|GET_DEVS);
if (pre_exist->array.level != UnSet) {
pr_err("Found some drive for an array that is already active: %s\n",
mp->path);
strcmp(mddev, chosen_name) != 0)
pr_err("Merging with already-assembled %s\n",
chosen_name);
- mdfd = open_dev_excl(mp->devnum);
+ mdfd = open_dev_excl(mp->devnm);
} else {
int trustworthy = FOREIGN;
name = content->name;
if (get_linux_version() < 2004000 ||
md_get_version(mdfd) < 9000) {
pr_err("Assemble requires Linux 2.4 or later, and\n"
- " md driver version 0.90.0 or later.\n"
- " Upgrade your kernel or try --build\n");
+ " md driver version 0.90.0 or later.\n"
+ " Upgrade your kernel or try --build\n");
close(mdfd);
return 1;
}
if (pre_exist == NULL) {
- if (mddev_busy(fd2devnum(mdfd))) {
+ if (mddev_busy(fd2devnm(mdfd))) {
pr_err("%s already active, cannot restart it!\n",
mddev);
for (tmpdev = devlist ;
/* This is a member of a container. Try starting the array. */
int err;
err = assemble_container_content(st, mdfd, content, c,
- chosen_name);
+ chosen_name, NULL);
close(mdfd);
return err;
}
/* Ok, no bad inconsistancy, we can try updating etc */
devices = xcalloc(num_devs, sizeof(*devices));
devmap = xcalloc(num_devs, content->array.raid_disks);
- devcnt = load_devices(devices, devmap, ident, st, devlist,
+ devcnt = load_devices(devices, devmap, ident, &st, devlist,
c, content, mdfd, mddev,
&most_recent, &bestcnt, &best, inargv);
if (devcnt < 0)
if (devcnt == 0) {
pr_err("no devices found for %s\n",
- mddev);
+ mddev);
if (st)
st->ss->free_super(st);
close(mdfd);
*/
avail = xcalloc(content->array.raid_disks, 1);
okcnt = 0;
+ replcnt = 0;
sparecnt=0;
rebuilding_cnt=0;
for (i=0; i< bestcnt; i++) {
/* If this device thinks that 'most_recent' has failed, then
* we must reject this device.
*/
- if (j != most_recent &&
+ if (j != most_recent && !c->force &&
content->array.raid_disks > 0 &&
devices[most_recent].i.disk.raid_disk >= 0 &&
devmap[j * content->array.raid_disks + devices[most_recent].i.disk.raid_disk] == 0) {
if (c->verbose > -1)
pr_err("ignoring %s as it reports %s as failed\n",
- devices[j].devname, devices[most_recent].devname);
+ devices[j].devname, devices[most_recent].devname);
best[i] = -1;
continue;
}
+ /* Require event counter to be same as, or just less than,
+ * most recent. If it is bigger, it must be a stray spare and
+ * should be ignored.
+ */
if (devices[j].i.events+event_margin >=
- devices[most_recent].i.events) {
+ devices[most_recent].i.events &&
+ devices[j].i.events <=
+ devices[most_recent].i.events
+ ) {
devices[j].uptodate = 1;
- if (i < content->array.raid_disks) {
+ if (i < content->array.raid_disks * 2) {
if (devices[j].i.recovery_start == MaxSector ||
(content->reshape_active &&
((i >= content->array.raid_disks - content->delta_disks) ||
(i >= content->array.raid_disks - content->delta_disks - 1
&& content->array.level == 4)))) {
- okcnt++;
- avail[i]=1;
+ if (!avail[i/2]) {
+ okcnt++;
+ avail[i/2]=1;
+ } else
+ replcnt++;
} else
rebuilding_cnt++;
} else
}
}
free(devmap);
- if (c->force)
- okcnt += force_array(content, devices, best, bestcnt,
- avail, most_recent, st, c);
-
+ if (c->force) {
+ int force_ok = force_array(content, devices, best, bestcnt,
+ avail, most_recent, st, c);
+ okcnt += force_ok;
+ if (force_ok)
+ was_forced = 1;
+ }
/* Now we want to look at the superblock which the kernel will base things on
* and compare the devices that we think are working with the devices that the
* superblock thinks are working.
*/
chosen_drive = -1;
st->ss->free_super(st);
- for (i=0; chosen_drive < 0 && i<bestcnt; i++) {
+ for (i=0; chosen_drive < 0 && i<bestcnt; i+=2) {
int j = best[i];
int fd;
devices[j].included ? O_RDONLY
: (O_RDONLY|O_EXCL)))< 0) {
pr_err("Cannot open %s: %s\n",
- devices[j].devname, strerror(errno));
+ devices[j].devname, strerror(errno));
close(mdfd);
free(devices);
return 1;
if (st->ss->load_super(st,fd, NULL)) {
close(fd);
pr_err("RAID superblock has disappeared from %s\n",
- devices[j].devname);
+ devices[j].devname);
close(mdfd);
free(devices);
return 1;
}
st->ss->getinfo_super(st, content, NULL);
#ifndef MDASSEMBLE
- sysfs_init(content, mdfd, 0);
+ sysfs_init(content, mdfd, NULL);
#endif
for (i=0; i<bestcnt; i++) {
int j = best[i];
unsigned int desired_state;
- if (i < content->array.raid_disks)
- desired_state = (1<<MD_DISK_ACTIVE) | (1<<MD_DISK_SYNC);
- else
+ if (i >= content->array.raid_disks * 2)
desired_state = 0;
+ else if (i & 1)
+ desired_state = (1<<MD_DISK_ACTIVE) | (1<<MD_DISK_REPLACEMENT);
+ else
+ desired_state = (1<<MD_DISK_ACTIVE) | (1<<MD_DISK_SYNC);
if (j<0)
continue;
if (c->force) {
if (c->verbose >= 0)
pr_err("clearing FAULTY flag for device %d in %s for %s\n",
- j, mddev, devices[j].devname);
+ j, mddev, devices[j].devname);
change = 1;
} else {
if (c->verbose >= -1)
pr_err("device %d in %s has wrong state in superblock, but %s seems ok\n",
- i, mddev, devices[j].devname);
+ i, mddev, devices[j].devname);
}
}
#if 0
if (!(super.disks[i].i.disk.state & (1 << MD_DISK_FAULTY))) {
pr_err("devices %d of %s is not marked FAULTY in superblock, but cannot be found\n",
- i, mddev);
+ i, mddev);
}
#endif
}
change += st->ss->update_super(st, content, "force-array",
devices[chosen_drive].devname, c->verbose,
0, NULL);
+ was_forced = 1;
clean = 1;
}
O_RDWR : (O_RDWR|O_EXCL));
if (fd < 0) {
pr_err("Could not open %s for write - cannot Assemble array.\n",
- devices[chosen_drive].devname);
+ devices[chosen_drive].devname);
close(mdfd);
free(devices);
return 1;
if (st->ss->store_super(st, fd)) {
close(fd);
pr_err("Could not re-write superblock on %s\n",
- devices[chosen_drive].devname);
+ devices[chosen_drive].devname);
close(mdfd);
free(devices);
return 1;
}
if (c->verbose >= 0)
pr_err("Marking array %s as 'clean'\n",
- mddev);
+ mddev);
close(fd);
}
int *fdlist = xmalloc(sizeof(int)* bestcnt);
if (c->verbose > 0)
pr_err(":%s has an active reshape - checking "
- "if critical section needs to be restored\n",
- chosen_name);
- for (i=0; i<bestcnt; i++) {
- int j = best[i];
+ "if critical section needs to be restored\n",
+ chosen_name);
+ enable_fds(bestcnt/2);
+ for (i = 0; i < bestcnt/2; i++) {
+ int j = best[i*2];
if (j >= 0) {
fdlist[i] = dev_open(devices[j].devname,
devices[j].included
? O_RDWR : (O_RDWR|O_EXCL));
if (fdlist[i] < 0) {
pr_err("Could not open %s for write - cannot Assemble array.\n",
- devices[j].devname);
+ devices[j].devname);
err = 1;
break;
}
if (st->ss->external && st->ss->recover_backup)
err = st->ss->recover_backup(st, content);
else
- err = Grow_restart(st, content, fdlist, bestcnt,
+ err = Grow_restart(st, content, fdlist, bestcnt/2,
c->backup_file, c->verbose > 0);
if (err && c->invalid_backup) {
if (c->verbose > 0)
pr_err("continuing"
- " without restoring backup\n");
+ " without restoring backup\n");
err = 0;
}
}
/* First, fill in the map, so that udev can find our name
* as soon as we become active.
*/
- map_update(&map, fd2devnum(mdfd), content->text_version,
+ if (c->update && strcmp(c->update, "metadata")==0) {
+ content->array.major_version = 1;
+ content->array.minor_version = 0;
+ strcpy(content->text_version, "1.0");
+ }
+
+ map_update(&map, fd2devnm(mdfd), content->text_version,
content->uuid, chosen_name);
rv = start_array(mdfd, mddev, content,
chosen_drive, devices, okcnt, sparecnt,
rebuilding_cnt,
c,
- clean, avail, start_partial_ok);
+ clean, avail, start_partial_ok,
+ pre_exist != NULL,
+ was_forced);
if (rv == 1 && !pre_exist)
ioctl(mdfd, STOP_ARRAY, NULL);
- close(mdfd);
free(devices);
map_unlock(&map);
if (rv == 0) {
wait_for(chosen_name, mdfd);
+ close(mdfd);
if (auto_assem) {
int usecs = 1;
/* There is a nasty race with 'mdadm --monitor'.
usecs <<= 1;
}
}
- }
+ } else
+ close(mdfd);
+
/* '2' means 'OK, but not started yet' */
return rv == 2 ? 0 : rv;
}
#ifndef MDASSEMBLE
int assemble_container_content(struct supertype *st, int mdfd,
struct mdinfo *content, struct context *c,
- char *chosen_name)
+ char *chosen_name, int *result)
{
struct mdinfo *dev, *sra;
int working = 0, preexist = 0;
struct map_ent *map = NULL;
int old_raid_disks;
int start_reshape;
+ char *avail = NULL;
+ int err;
- sysfs_init(content, mdfd, 0);
+ sysfs_init(content, mdfd, NULL);
- sra = sysfs_read(mdfd, 0, GET_VERSION);
+ sra = sysfs_read(mdfd, NULL, GET_VERSION);
if (sra == NULL || strcmp(sra->text_version, content->text_version) != 0) {
if (content->array.major_version == -1 &&
content->array.minor_version == -2 &&
* Check if metadata requests blocking container wide reshapes
*/
start_reshape = (content->reshape_active &&
- !((content->reshape_active == CONTAINER_RESHAPE) &&
- (content->array.state & (1<<MD_SB_BLOCK_CONTAINER_RESHAPE))));
+ !((content->reshape_active == CONTAINER_RESHAPE) &&
+ (content->array.state & (1<<MD_SB_BLOCK_CONTAINER_RESHAPE))));
/* Block subarray here if it is under reshape now
* Do not allow for any changes in this array
if (sra)
sysfs_free(sra);
old_raid_disks = content->array.raid_disks - content->delta_disks;
- for (dev = content->devs; dev; dev = dev->next)
+ avail = xcalloc(content->array.raid_disks, 1);
+ for (dev = content->devs; dev; dev = dev->next) {
+ if (dev->disk.raid_disk >= 0)
+ avail[dev->disk.raid_disk] = 1;
if (sysfs_add_disk(content, dev, 1) == 0) {
if (dev->disk.raid_disk >= old_raid_disks &&
content->reshape_active)
working++;
} else if (errno == EEXIST)
preexist++;
- if (working + expansion == 0)
+ }
+ if (working + expansion == 0 && c->runstop <= 0) {
+ free(avail);
return 1;/* Nothing new, don't try to start */
-
- map_update(&map, fd2devnum(mdfd),
+ }
+ map_update(&map, fd2devnm(mdfd),
content->text_version,
content->uuid, chosen_name);
- if (c->runstop > 0 ||
- (working + preexist + expansion) >=
- content->array.working_disks) {
- int err;
- if (start_reshape) {
- int spare = content->array.raid_disks + expansion;
- if (restore_backup(st, content,
- working,
- spare, c->backup_file, c->verbose) == 1)
- return 1;
+ if (enough(content->array.level, content->array.raid_disks,
+ content->array.layout, content->array.state & 1, avail) == 0) {
+ if (c->export && result)
+ *result |= INCR_NO;
+ else if (c->verbose >= 0) {
+ pr_err("%s assembled with %d device%s",
+ chosen_name, preexist + working,
+ preexist + working == 1 ? "":"s");
+ if (preexist)
+ fprintf(stderr, " (%d new)", working);
+ fprintf(stderr, " but not started\n");
+ }
+ free(avail);
+ return 1;
+ }
+ free(avail);
+
+ if (c->runstop <= 0 &&
+ (working + preexist + expansion) <
+ content->array.working_disks) {
+ if (c->export && result)
+ *result |= INCR_UNSAFE;
+ else if (c->verbose >= 0) {
+ pr_err("%s assembled with %d device%s",
+ chosen_name, preexist + working,
+ preexist + working == 1 ? "":"s");
+ if (preexist)
+ fprintf(stderr, " (%d new)", working);
+ fprintf(stderr, " but not safe to start\n");
+ }
+ return 1;
+ }
- err = sysfs_set_str(content, NULL,
- "array_state", "readonly");
- if (err)
- return 1;
- if (st->ss->external) {
- if (!mdmon_running(st->container_dev))
- start_mdmon(st->container_dev);
- ping_monitor_by_id(st->container_dev);
- if (mdmon_running(st->container_dev) &&
- st->update_tail == NULL)
- st->update_tail = &st->updates;
- }
+ if (start_reshape) {
+ int spare = content->array.raid_disks + expansion;
+ if (restore_backup(st, content,
+ working,
+ spare, c->backup_file, c->verbose) == 1)
+ return 1;
+
+ err = sysfs_set_str(content, NULL,
+ "array_state", "readonly");
+ if (err)
+ return 1;
+
+ if (st->ss->external) {
+ if (!mdmon_running(st->container_devnm))
+ start_mdmon(st->container_devnm);
+ ping_monitor(st->container_devnm);
+ if (mdmon_running(st->container_devnm) &&
+ st->update_tail == NULL)
+ st->update_tail = &st->updates;
+ }
- err = Grow_continue(mdfd, st, content, c->backup_file,
- c->freeze_reshape);
- } else switch(content->array.level) {
+ err = Grow_continue(mdfd, st, content, c->backup_file,
+ c->freeze_reshape);
+ } else switch(content->array.level) {
case LEVEL_LINEAR:
case LEVEL_MULTIPATH:
case 0:
break;
default:
err = sysfs_set_str(content, NULL, "array_state",
- "readonly");
+ "readonly");
/* start mdmon if needed. */
if (!err) {
- if (!mdmon_running(st->container_dev))
- start_mdmon(st->container_dev);
- ping_monitor_by_id(st->container_dev);
+ if (!mdmon_running(st->container_devnm))
+ start_mdmon(st->container_devnm);
+ ping_monitor(st->container_devnm);
}
break;
}
- if (!err)
- sysfs_set_safemode(content, content->safe_mode_delay);
+ if (!err)
+ sysfs_set_safemode(content, content->safe_mode_delay);
- /* Block subarray here if it is not reshaped now
- * It has be blocked a little later to allow mdmon to switch in
- * in to R/W state
- */
- if (st->ss->external && content->recovery_blocked &&
- !start_reshape)
- block_subarray(content);
+ /* Block subarray here if it is not reshaped now
+ * It has be blocked a little later to allow mdmon to switch in
+ * in to R/W state
+ */
+ if (st->ss->external && content->recovery_blocked &&
+ !start_reshape)
+ block_subarray(content);
- if (c->verbose >= 0) {
- if (err)
- pr_err("array %s now has %d device%s",
- chosen_name, working + preexist,
- working + preexist == 1 ? "":"s");
- else
- pr_err("Started %s with %d device%s",
- chosen_name, working + preexist,
- working + preexist == 1 ? "":"s");
- if (preexist)
- fprintf(stderr, " (%d new)", working);
- if (expansion)
- fprintf(stderr, " ( + %d for expansion)",
- expansion);
- fprintf(stderr, "\n");
- }
- if (!err)
- wait_for(chosen_name, mdfd);
- return err;
- /* FIXME should have an O_EXCL and wait for read-auto */
- } else {
- if (c->verbose >= 0) {
- pr_err("%s assembled with %d device%s",
- chosen_name, preexist + working,
- preexist + working == 1 ? "":"s");
- if (preexist)
- fprintf(stderr, " (%d new)", working);
- fprintf(stderr, " but not started\n");
- }
- return 1;
+ if (c->export && result) {
+ if (err)
+ *result |= INCR_NO;
+ else
+ *result |= INCR_YES;
+ } else if (c->verbose >= 0) {
+ if (err)
+ pr_err("array %s now has %d device%s",
+ chosen_name, working + preexist,
+ working + preexist == 1 ? "":"s");
+ else
+ pr_err("Started %s with %d device%s",
+ chosen_name, working + preexist,
+ working + preexist == 1 ? "":"s");
+ if (preexist)
+ fprintf(stderr, " (%d new)", working);
+ if (expansion)
+ fprintf(stderr, " ( + %d for expansion)",
+ expansion);
+ fprintf(stderr, "\n");
}
+ if (!err)
+ wait_for(chosen_name, mdfd);
+ return err;
+ /* FIXME should have an O_EXCL and wait for read-auto */
}
#endif
-
projects / thirdparty / mdadm.git / blobdiff