same_uuid(content->uuid, ident->uuid, tst->ss->swapuuid)==0 &&
memcmp(content->uuid, uuid_zero, sizeof(int[4])) != 0) {
if (devname)
- fprintf(stderr, Name ": %s has wrong uuid.\n",
- devname);
+ pr_err("%s has wrong uuid.\n", devname);
return 0;
}
if (ident->name[0] && (!update || strcmp(update, "name")!= 0) &&
name_matches(content->name, ident->name, homehost)==0) {
if (devname)
- fprintf(stderr, Name ": %s has wrong name.\n",
- devname);
+ pr_err("%s has wrong name.\n", devname);
return 0;
}
if (ident->super_minor != UnSet &&
ident->super_minor != content->array.md_minor) {
if (devname)
- fprintf(stderr, Name ": %s has wrong super-minor.\n",
- devname);
+ pr_err("%s has wrong super-minor.\n",
+ devname);
return 0;
}
if (ident->level != UnSet &&
ident->level != content->array.level) {
if (devname)
- fprintf(stderr, Name ": %s has wrong raid level.\n",
- devname);
+ pr_err("%s has wrong raid level.\n",
+ devname);
return 0;
}
if (ident->raid_disks != UnSet &&
ident->raid_disks!= content->array.raid_disks) {
if (devname)
- fprintf(stderr, Name ": %s requires wrong number of drives.\n",
- devname);
+ pr_err("%s requires wrong number of drives.\n",
+ devname);
return 0;
}
if (ident->member && ident->member[0]) {
char *s = strchr(content->text_version+1, '/');
if (s == NULL) {
if (devname)
- fprintf(stderr, Name ": %s is not a container and one is required.\n",
- devname);
+ pr_err("%s is not a container and one is required.\n",
+ devname);
return 0;
} else if (strcmp(ident->member, s+1) != 0) {
if (devname)
- fprintf(stderr, Name ": skipping wrong member %s is %s\n",
- content->text_version, devname);
+ pr_err("skipping wrong member %s is %s\n",
+ content->text_version, devname);
return 0;
}
}
char *backup_file, int invalid_backup,
int readonly, int runstop,
char *update, char *homehost, int require_homehost,
- int verbose, int force)
+ int verbose, int force, int freeze_reshape)
{
/*
* The task of Assemble is to find a collection of
int change = 0;
int inargv = 0;
int report_missmatch;
+#ifndef MDASSEMBLE
int bitmap_done;
+#endif
int start_partial_ok = (runstop >= 0) &&
(force || devlist==NULL || auto_assem);
unsigned int num_devs;
ident->name[0] == 0 &&
(ident->container == NULL || ident->member == NULL) &&
ident->devices == NULL) {
- fprintf(stderr, Name ": No identity information available for %s - cannot assemble.\n",
- mddev ? mddev : "further assembly");
+ pr_err("No identity information available for %s - cannot assemble.\n",
+ mddev ? mddev : "further assembly");
return 1;
}
if (!st && ident->st) st = ident->st;
if (verbose>0)
- fprintf(stderr, Name ": looking for devices for %s\n",
- mddev ? mddev : "further assembly");
+ pr_err("looking for devices for %s\n",
+ mddev ? mddev : "further assembly");
/* first walk the list of devices to find a consistent set
* that match the criterea, if that is possible.
char *devname = tmpdev->devname;
int dfd;
struct stat stb;
- struct supertype *tst = dup_super(st);
+ struct supertype *tst;
struct dev_policy *pol = NULL;
int found_container = 0;
if (ident->devices &&
!match_oneof(ident->devices, devname)) {
if (report_missmatch)
- fprintf(stderr, Name ": %s is not one of %s\n", devname, ident->devices);
+ pr_err("%s is not one of %s\n", devname, ident->devices);
continue;
}
- dfd = dev_open(devname, O_RDONLY|O_EXCL);
+ tst = dup_super(st);
+
+ dfd = dev_open(devname, O_RDONLY);
if (dfd < 0) {
if (report_missmatch)
- fprintf(stderr, Name ": cannot open device %s: %s\n",
- devname, strerror(errno));
+ pr_err("cannot open device %s: %s\n",
+ devname, strerror(errno));
tmpdev->used = 2;
} else if (fstat(dfd, &stb)< 0) {
/* Impossible! */
- fprintf(stderr, Name ": fstat failed for %s: %s\n",
- devname, strerror(errno));
+ pr_err("fstat failed for %s: %s\n",
+ devname, strerror(errno));
tmpdev->used = 2;
} else if ((stb.st_mode & S_IFMT) != S_IFBLK) {
- fprintf(stderr, Name ": %s is not a block device.\n",
- devname);
+ pr_err("%s is not a block device.\n",
+ devname);
tmpdev->used = 2;
} else if (must_be_container(dfd)) {
if (st) {
* be another one.
*/
if (report_missmatch)
- fprintf(stderr, Name ": %s is a container, but we are looking for components\n",
- devname);
+ 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)
- fprintf(stderr, Name ": not a recognisable container: %s\n",
- devname);
+ 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)
- fprintf(stderr, Name ": no correct container type: %s\n",
- devname);
+ 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)),
tst->ss->match_home(tst, homehost) == 1)) {
if (report_missmatch)
- fprintf(stderr, Name ": %s has metadata type %s for which "
- "auto-assembly is disabled\n",
- devname, tst->ss->name);
+ pr_err("%s has metadata type %s for which "
+ "auto-assembly is disabled\n",
+ devname, tst->ss->name);
tmpdev->used = 2;
} else
found_container = 1;
} else {
if (!tst && (tst = guess_super(dfd)) == NULL) {
if (report_missmatch)
- fprintf(stderr, Name ": no recogniseable superblock on %s\n",
- devname);
+ pr_err("no recogniseable superblock on %s\n",
+ devname);
tmpdev->used = 2;
} else if (tst->ss->load_super(tst,dfd, NULL)) {
if (report_missmatch)
- fprintf(stderr, Name ": no RAID superblock on %s\n",
- devname);
+ pr_err("no RAID superblock on %s\n",
+ devname);
tmpdev->used = 2;
} else if (tst->ss->compare_super == NULL) {
if (report_missmatch)
- fprintf(stderr, Name ": Cannot assemble %s metadata on %s\n",
- tst->ss->name, devname);
+ 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)),
tst->ss->match_home(tst, homehost) == 1)) {
if (report_missmatch)
- fprintf(stderr, Name ": %s has metadata type %s for which "
- "auto-assembly is disabled\n",
- devname, tst->ss->name);
+ pr_err("%s has metadata type %s for which "
+ "auto-assembly is disabled\n",
+ devname, tst->ss->name);
tmpdev->used = 2;
}
}
goto loop;
- fprintf(stderr, Name ": %s has no superblock - assembly aborted\n",
+ pr_err("%s has no superblock - assembly aborted\n",
devname);
if (st)
st->ss->free_super(st);
/* tmpdev is a container. We need to be either
* looking for a member, or auto-assembling
*/
+ /* 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)
+ 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)
- fprintf(stderr, Name ": %s is not the container required (%s)\n",
+ pr_err("%s is not the container required (%s)\n",
devname, ident->container);
goto loop;
}
int uuid[4];
content = &info;
- memset(content, 0, sizeof(*content));
tst->ss->getinfo_super(tst, content, NULL);
if (!parse_uuid(ident->container, uuid) ||
!same_uuid(content->uuid, uuid, tst->ss->swapuuid)) {
if (report_missmatch)
- fprintf(stderr, Name ": %s has wrong UUID to be required container\n",
+ pr_err("%s has wrong UUID to be required container\n",
devname);
goto loop;
}
/* It is worth looking inside this container.
*/
if (verbose > 0)
- fprintf(stderr, Name ": looking in container %s\n",
+ pr_err("looking in container %s\n",
devname);
for (content = tst->ss->container_content(tst, NULL);
content;
content = content->next) {
- /* do not assemble arrays that might have bad blocks */
- if (content->array.state & (1<<MD_SB_BBM_ERRORS)) {
- fprintf(stderr, Name ": BBM log found in metadata. "
- "Cannot activate array(s).\n");
- tmpdev->used = 2;
- goto loop;
- }
if (!ident_matches(ident, content, tst,
homehost, update,
report_missmatch ? devname : NULL))
/* message already printed */;
else if (is_member_busy(content->text_version)) {
if (report_missmatch)
- fprintf(stderr, Name ": member %s in %s is already assembled\n",
+ pr_err("member %s in %s is already assembled\n",
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);
} else
break;
}
st = tst; tst = NULL;
if (!auto_assem && inargv && tmpdev->next != NULL) {
- fprintf(stderr, Name ": %s is a container, but is not "
+ pr_err("%s is a container, but is not "
"only device given: confused and aborting\n",
devname);
st->ss->free_super(st);
return 1;
}
if (verbose > 0)
- fprintf(stderr, Name ": found match on member %s in %s\n",
+ pr_err("found match on member %s in %s\n",
content->text_version, devname);
/* make sure we finished the loop */
} else {
content = &info;
- memset(content, 0, sizeof(*content));
tst->ss->getinfo_super(tst, content, NULL);
if (!ident_matches(ident, content, tst,
report_missmatch ? devname : NULL))
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)
+ pr_err("%s is busy - skipping\n", devname);
+ goto loop;
+ }
+ close(dfd);
+
if (st == NULL)
st = dup_super(tst);
if (st->minor_version == -1)
/* We can do something */
if (first) {/* just ignore this one */
if (report_missmatch)
- fprintf(stderr, Name ": %s misses out due to wrong homehost\n",
+ pr_err("%s misses out due to wrong homehost\n",
devname);
goto loop;
} else { /* reject all those sofar */
struct mddev_dev *td;
if (report_missmatch)
- fprintf(stderr, Name ": %s overrides previous devices due to good homehost\n",
+ pr_err("%s overrides previous devices due to good homehost\n",
devname);
for (td=devlist; td != tmpdev; td=td->next)
if (td->used == 1)
}
}
}
- fprintf(stderr, Name ": superblock on %s doesn't match others - assembly aborted\n",
+ pr_err("superblock on %s doesn't match others - assembly aborted\n",
devname);
tst->ss->free_super(tst);
st->ss->free_super(st);
if (tmpdev->used != 3)
continue;
if (stat(tmpdev->devname, &stb)< 0) {
- fprintf(stderr, Name ": fstat failed for %s: %s\n",
+ pr_err("fstat failed for %s: %s\n",
tmpdev->devname, strerror(errno));
tmpdev->used = 2;
} else {
mddev = chosen_name;
vers = md_get_version(mdfd);
if (vers < 9000) {
- fprintf(stderr, Name ": Assemble requires driver version 0.90.0 or later.\n"
+ pr_err("Assemble requires driver version 0.90.0 or later.\n"
" Upgrade your kernel or try --build\n");
close(mdfd);
return 1;
}
if (mddev_busy(fd2devnum(mdfd))) {
- fprintf(stderr, Name ": %s already active, cannot restart it!\n",
+ pr_err("%s already active, cannot restart it!\n",
mddev);
for (tmpdev = devlist ;
tmpdev && tmpdev->used != 1;
tmpdev = tmpdev->next)
;
if (tmpdev && auto_assem)
- fprintf(stderr, Name ": %s needed for %s...\n",
+ pr_err("%s needed for %s...\n",
mddev, tmpdev->devname);
close(mdfd);
mdfd = -3;
int err;
err = assemble_container_content(st, mdfd, content, runstop,
chosen_name, verbose,
- backup_file);
+ backup_file, freeze_reshape);
close(mdfd);
return err;
}
+ bitmap_done = 0;
#endif
/* Ok, no bad inconsistancy, we can try updating etc */
- bitmap_done = 0;
- content->update_private = NULL;
devices = malloc(num_devs * sizeof(*devices));
devmap = calloc(num_devs * content->array.raid_disks, 1);
for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) if (tmpdev->used == 1) {
tst = dup_super(st);
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
- fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
+ pr_err("cannot re-read metadata from %s - aborting\n",
devname);
if (dfd >= 0)
close(dfd);
ident->uuid_set,
homehost);
if (err < 0) {
- fprintf(stderr,
- Name ": --update=%s not understood"
- " for %s metadata\n",
- update, tst->ss->name);
+ pr_err("--update=%s not understood"
+ " for %s metadata\n",
+ update, tst->ss->name);
tst->ss->free_super(tst);
free(tst);
close(mdfd);
memcpy(ident->uuid, content->uuid, 16);
}
if (tst->ss->store_super(tst, dfd))
- fprintf(stderr, Name ": Could not re-write superblock on %s.\n",
+ pr_err("Could not re-write superblock on %s.\n",
devname);
close(dfd);
if (bitmap_update_uuid(ident->bitmap_fd,
content->uuid,
tst->ss->swapuuid) != 0)
- fprintf(stderr, Name ": Could not update uuid on external bitmap.\n");
+ pr_err("Could not update uuid on external bitmap.\n");
else
bitmap_done = 1;
}
dfd = dev_open(devname, O_RDWR|O_EXCL);
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
- fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
+ pr_err("cannot re-read metadata from %s - aborting\n",
devname);
if (dfd >= 0)
close(dfd);
stat(devname, &stb);
if (verbose > 0)
- fprintf(stderr, Name ": %s is identified as a member of %s, slot %d.\n",
+ pr_err("%s is identified as a member of %s, slot %d.\n",
devname, mddev, content->disk.raid_disk);
devices[devcnt].devname = devname;
devices[devcnt].uptodate = 0;
* Could be a mis-detection caused by overlapping
* partitions. fail-safe.
*/
- fprintf(stderr, Name ": WARNING %s and %s appear"
+ pr_err("WARNING %s and %s appear"
" to have very similar superblocks.\n"
" If they are really different, "
"please --zero the superblock on one\n"
}
devcnt++;
}
- free(content->update_private);
- content->update_private = NULL;
if (devcnt == 0) {
- fprintf(stderr, Name ": no devices found for %s\n",
+ pr_err("no devices found for %s\n",
mddev);
if (st)
st->ss->free_super(st);
}
continue;
}
- /* If this devices thinks that 'most_recent' has failed, then
+ /* If this device thinks that 'most_recent' has failed, then
* we must reject this device.
*/
if (j != most_recent &&
devices[most_recent].i.disk.raid_disk >= 0 &&
devmap[j * content->array.raid_disks + devices[most_recent].i.disk.raid_disk] == 0) {
if (verbose > -1)
- fprintf(stderr, Name ": ignoring %s as it reports %s as failed\n",
+ pr_err("ignoring %s as it reports %s as failed\n",
devices[j].devname, devices[most_recent].devname);
best[i] = -1;
continue;
if (i < content->array.raid_disks) {
if (devices[j].i.recovery_start == MaxSector ||
(content->reshape_active &&
- j >= content->array.raid_disks - content->delta_disks)) {
+ ((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;
} else
}
}
free(devmap);
- while (force && !enough(content->array.level, content->array.raid_disks,
- content->array.layout, 1,
- avail, okcnt)) {
+ while (force &&
+ (!enough(content->array.level, content->array.raid_disks,
+ content->array.layout, 1,
+ avail)
+ ||
+ (content->reshape_active && content->delta_disks > 0 &&
+ !enough(content->array.level, (content->array.raid_disks
+ - content->delta_disks),
+ content->new_layout, 1,
+ avail)
+ ))) {
/* Choose the newest best drive which is
* not up-to-date, update the superblock
* and add it.
current_events = devices[chosen_drive].i.events;
add_another:
if (verbose >= 0)
- fprintf(stderr, Name ": forcing event count in %s(%d) from %d upto %d\n",
+ 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));
fd = dev_open(devices[chosen_drive].devname, O_RDWR|O_EXCL);
if (fd < 0) {
- fprintf(stderr, Name ": Couldn't open %s for write - not updating\n",
+ pr_err("Couldn't open %s for write - not updating\n",
devices[chosen_drive].devname);
devices[chosen_drive].i.events = 0;
continue;
tst = dup_super(st);
if (tst->ss->load_super(tst,fd, NULL)) {
close(fd);
- fprintf(stderr, Name ": RAID superblock disappeared from %s - not updating.\n",
+ pr_err("RAID superblock disappeared from %s - not updating.\n",
devices[chosen_drive].devname);
devices[chosen_drive].i.events = 0;
continue;
if (tst->ss->store_super(tst, fd)) {
close(fd);
- fprintf(stderr, Name ": Could not re-write superblock on %s\n",
+ pr_err("Could not re-write superblock on %s\n",
devices[chosen_drive].devname);
devices[chosen_drive].i.events = 0;
tst->ss->free_super(tst);
int j = best[i];
if (j >= 0 &&
!devices[j].uptodate &&
+ devices[j].i.recovery_start == MaxSector &&
devices[j].i.events == current_events) {
chosen_drive = j;
goto add_another;
continue;
if (!devices[j].uptodate)
continue;
+ if (devices[j].i.events < devices[most_recent].i.events)
+ continue;
chosen_drive = j;
if ((fd=dev_open(devices[j].devname, O_RDONLY|O_EXCL))< 0) {
- fprintf(stderr, Name ": Cannot open %s: %s\n",
+ pr_err("Cannot open %s: %s\n",
devices[j].devname, strerror(errno));
close(mdfd);
free(devices);
}
if (st->ss->load_super(st,fd, NULL)) {
close(fd);
- fprintf(stderr, Name ": RAID superblock has disappeared from %s\n",
+ pr_err("RAID superblock has disappeared from %s\n",
devices[j].devname);
close(mdfd);
free(devices);
close(fd);
}
if (st->sb == NULL) {
- fprintf(stderr, Name ": No suitable drives found for %s\n", mddev);
+ pr_err("No suitable drives found for %s\n", mddev);
close(mdfd);
free(devices);
return 1;
verbose, 0, NULL)) {
if (force) {
if (verbose >= 0)
- fprintf(stderr, Name ": "
- "clearing FAULTY flag for device %d in %s for %s\n",
+ pr_err("clearing FAULTY flag for device %d in %s for %s\n",
j, mddev, devices[j].devname);
change = 1;
} else {
if (verbose >= -1)
- fprintf(stderr, Name ": "
- "device %d in %s has wrong state in superblock, but %s seems ok\n",
+ pr_err("device %d in %s has wrong state in superblock, but %s seems ok\n",
i, mddev, devices[j].devname);
}
}
#if 0
if (!(super.disks[i].i.disk.state & (1 << MD_DISK_FAULTY))) {
- fprintf(stderr, Name ": devices %d of %s is not marked FAULTY in superblock, but cannot be found\n",
+ pr_err("devices %d of %s is not marked FAULTY in superblock, but cannot be found\n",
i, mddev);
}
#endif
if (force && !clean &&
!enough(content->array.level, content->array.raid_disks,
content->array.layout, clean,
- avail, okcnt)) {
+ avail)) {
change += st->ss->update_super(st, content, "force-array",
devices[chosen_drive].devname, verbose,
0, NULL);
int fd;
fd = dev_open(devices[chosen_drive].devname, O_RDWR|O_EXCL);
if (fd < 0) {
- fprintf(stderr, Name ": Could not open %s for write - cannot Assemble array.\n",
+ pr_err("Could not open %s for write - cannot Assemble array.\n",
devices[chosen_drive].devname);
close(mdfd);
free(devices);
}
if (st->ss->store_super(st, fd)) {
close(fd);
- fprintf(stderr, Name ": Could not re-write superblock on %s\n",
+ pr_err("Could not re-write superblock on %s\n",
devices[chosen_drive].devname);
close(mdfd);
free(devices);
return 1;
}
+ if (verbose >= 0)
+ pr_err("Marking array %s as 'clean'\n",
+ mddev);
close(fd);
}
int err = 0;
int *fdlist = malloc(sizeof(int)* bestcnt);
if (verbose > 0)
- fprintf(stderr, Name ":%s has an active reshape - checking "
+ pr_err(":%s has an active reshape - checking "
"if critical section needs to be restored\n",
chosen_name);
for (i=0; i<bestcnt; i++) {
if (j >= 0) {
fdlist[i] = dev_open(devices[j].devname, O_RDWR|O_EXCL);
if (fdlist[i] < 0) {
- fprintf(stderr, Name ": Could not open %s for write - cannot Assemble array.\n",
+ pr_err("Could not open %s for write - cannot Assemble array.\n",
devices[j].devname);
err = 1;
break;
fdlist[i] = -1;
}
if (!err) {
- err = Grow_restart(st, content, fdlist, bestcnt,
- backup_file, verbose > 0);
+ if (st->ss->external && st->ss->recover_backup)
+ err = st->ss->recover_backup(st, content);
+ else
+ err = Grow_restart(st, content, fdlist, bestcnt,
+ backup_file, verbose > 0);
if (err && invalid_backup) {
if (verbose > 0)
- fprintf(stderr, Name ": continuing"
+ pr_err("continuing"
" without restoring backup\n");
err = 0;
}
if (fdlist[i]>=0) close(fdlist[i]);
}
if (err) {
- fprintf(stderr, Name ": Failed to restore critical section for reshape, sorry.\n");
+ pr_err("Failed to restore critical section for reshape, sorry.\n");
if (backup_file == NULL)
- fprintf(stderr," Possibly you needed to specify the --backup-file\n");
+ cont_err("Possibly you needed to specify the --backup-file\n");
close(mdfd);
free(devices);
return err;
rv = set_array_info(mdfd, st, content);
if (rv) {
- fprintf(stderr, Name ": failed to set array info for %s: %s\n",
+ pr_err("failed to set array info for %s: %s\n",
mddev, strerror(errno));
ioctl(mdfd, STOP_ARRAY, NULL);
close(mdfd);
}
if (ident->bitmap_fd >= 0) {
if (ioctl(mdfd, SET_BITMAP_FILE, ident->bitmap_fd) != 0) {
- fprintf(stderr, Name ": SET_BITMAP_FILE failed.\n");
+ pr_err("SET_BITMAP_FILE failed.\n");
ioctl(mdfd, STOP_ARRAY, NULL);
close(mdfd);
free(devices);
/* From config file */
int bmfd = open(ident->bitmap_file, O_RDWR);
if (bmfd < 0) {
- fprintf(stderr, Name ": Could not open bitmap file %s\n",
+ pr_err("Could not open bitmap file %s\n",
ident->bitmap_file);
ioctl(mdfd, STOP_ARRAY, NULL);
close(mdfd);
return 1;
}
if (ioctl(mdfd, SET_BITMAP_FILE, bmfd) != 0) {
- fprintf(stderr, Name ": Failed to set bitmapfile for %s\n", mddev);
+ pr_err("Failed to set bitmapfile for %s\n", mddev);
close(bmfd);
ioctl(mdfd, STOP_ARRAY, NULL);
close(mdfd);
rv = add_disk(mdfd, st, content, &devices[j].i);
if (rv) {
- fprintf(stderr, Name ": failed to add "
- "%s to %s: %s\n",
- devices[j].devname,
- mddev,
- strerror(errno));
+ pr_err("failed to add "
+ "%s to %s: %s\n",
+ devices[j].devname,
+ mddev,
+ strerror(errno));
if (i < content->array.raid_disks
|| i == bestcnt)
okcnt--;
else
sparecnt--;
} else if (verbose > 0)
- fprintf(stderr, Name ": added %s "
- "to %s as %d\n",
- devices[j].devname, mddev,
- devices[j].i.disk.raid_disk);
+ pr_err("added %s to %s as %d%s\n",
+ devices[j].devname, mddev,
+ devices[j].i.disk.raid_disk,
+ devices[j].uptodate?"":
+ " (possibly out of date)");
} else if (verbose > 0 && i < content->array.raid_disks)
- fprintf(stderr, Name ": no uptodate device for "
+ pr_err("no uptodate device for "
"slot %d of %s\n",
i, mddev);
}
if (content->array.level == LEVEL_CONTAINER) {
if (verbose >= 0) {
- fprintf(stderr, Name ": Container %s has been "
+ pr_err("Container %s has been "
"assembled with %d drive%s",
mddev, okcnt+sparecnt, okcnt+sparecnt==1?"":"s");
if (okcnt < (unsigned)content->array.raid_disks)
if (runstop == 1 ||
(runstop <= 0 &&
( enough(content->array.level, content->array.raid_disks,
- content->array.layout, clean, avail, okcnt) &&
+ content->array.layout, clean, avail) &&
(okcnt + rebuilding_cnt >= req_cnt || start_partial_ok)
))) {
/* This array is good-to-go.
int rv;
#ifndef MDASSEMBLE
if (content->reshape_active &&
- content->delta_disks <= 0)
- rv = Grow_continue(mdfd, st, content, backup_file);
- else
+ content->delta_disks <= 0) {
+ rv = sysfs_set_str(content, NULL,
+ "array_state", "readonly");
+ if (rv == 0)
+ rv = Grow_continue(mdfd, st, content,
+ backup_file,
+ freeze_reshape);
+ } else
#endif
rv = ioctl(mdfd, RUN_ARRAY, NULL);
if (rv == 0) {
if (verbose >= 0) {
- fprintf(stderr, Name ": %s has been started with %d drive%s",
+ pr_err("%s has been started with %d drive%s",
mddev, okcnt, okcnt==1?"":"s");
if (okcnt < (unsigned)content->array.raid_disks)
fprintf(stderr, " (out of %d)", content->array.raid_disks);
sysfs_set_num(sra, NULL,
"stripe_cache_size",
(4 * content->array.chunk_size / 4096) + 1);
+ sysfs_free(sra);
}
}
if (okcnt < (unsigned)content->array.raid_disks) {
* might allow them to be included, or
* they will become spares.
*/
- for (i = 0; i <= bestcnt; i++) {
+ for (i = 0; i < bestcnt; i++) {
int j = best[i];
if (j >= 0 && !devices[j].uptodate) {
if (!disk_action_allows(&devices[j].i, st->ss->name, act_re_add))
rv = add_disk(mdfd, st, content,
&devices[j].i);
if (rv == 0 && verbose >= 0)
- fprintf(stderr,
- Name ": %s has been re-added.\n",
- devices[j].devname);
+ pr_err("%s has been re-added.\n",
+ devices[j].devname);
}
}
}
free(devices);
return 0;
}
- fprintf(stderr, Name ": failed to RUN_ARRAY %s: %s\n",
+ pr_err("failed to RUN_ARRAY %s: %s\n",
mddev, strerror(errno));
if (!enough(content->array.level, content->array.raid_disks,
- content->array.layout, 1, avail, okcnt))
- fprintf(stderr, Name ": Not enough devices to "
+ content->array.layout, 1, avail))
+ pr_err("Not enough devices to "
"start the array.\n");
else if (!enough(content->array.level,
content->array.raid_disks,
content->array.layout, clean,
- avail, okcnt))
- fprintf(stderr, Name ": Not enough devices to "
+ avail))
+ pr_err("Not enough devices to "
"start the array while not clean "
"- consider --force.\n");
return 1;
}
if (runstop == -1) {
- fprintf(stderr, Name ": %s assembled from %d drive%s",
- mddev, okcnt, okcnt==1?"":"s");
+ pr_err("%s assembled from %d drive%s",
+ mddev, okcnt, okcnt==1?"":"s");
if (okcnt != (unsigned)content->array.raid_disks)
fprintf(stderr, " (out of %d)", content->array.raid_disks);
fprintf(stderr, ", but not started.\n");
return 0;
}
if (verbose >= -1) {
- fprintf(stderr, Name ": %s assembled from %d drive%s", mddev, okcnt, okcnt==1?"":"s");
+ 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);
if (sparecnt)
fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
if (!enough(content->array.level, content->array.raid_disks,
- content->array.layout, 1, avail, okcnt))
+ content->array.layout, 1, avail))
fprintf(stderr, " - not enough to start the array.\n");
else if (!enough(content->array.level,
content->array.raid_disks,
content->array.layout, clean,
- avail, okcnt))
+ avail))
fprintf(stderr, " - not enough to start the "
"array while not clean - consider "
"--force.\n");
dev = makedev(devices[chosen_drive].i.disk.major,
devices[chosen_drive].i.disk.minor);
if (ioctl(mdfd, START_ARRAY, dev)) {
- fprintf(stderr, Name ": Cannot start array: %s\n",
+ pr_err("Cannot start array: %s\n",
strerror(errno));
}
int assemble_container_content(struct supertype *st, int mdfd,
struct mdinfo *content, int runstop,
char *chosen_name, int verbose,
- char *backup_file)
+ char *backup_file, int freeze_reshape)
{
struct mdinfo *dev, *sra;
int working = 0, preexist = 0;
int expansion = 0;
struct map_ent *map = NULL;
+ int old_raid_disks;
+ int start_reshape;
sysfs_init(content, mdfd, 0);
sra = sysfs_read(mdfd, 0, GET_VERSION);
if (sra == NULL || strcmp(sra->text_version, content->text_version) != 0)
- if (sysfs_set_array(content, md_get_version(mdfd)) != 0)
+ if (sysfs_set_array(content, md_get_version(mdfd)) != 0) {
+ if (sra)
+ sysfs_free(sra);
return 1;
+ }
+
+ /* There are two types of reshape: container wide or sub-array specific
+ * 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))));
- if (content->reshape_active)
+ /* Block subarray here if it is under reshape now
+ * Do not allow for any changes in this array
+ */
+ if (st->ss->external && content->recovery_blocked && start_reshape)
block_subarray(content);
if (sra)
sysfs_free(sra);
-
+ old_raid_disks = content->array.raid_disks - content->delta_disks;
for (dev = content->devs; dev; dev = dev->next)
if (sysfs_add_disk(content, dev, 1) == 0) {
- if (dev->disk.raid_disk >= content->array.raid_disks &&
+ if (dev->disk.raid_disk >= old_raid_disks &&
content->reshape_active)
expansion++;
else
working++;
} else if (errno == EEXIST)
preexist++;
- if (working == 0)
+ if (working + expansion == 0)
return 1;/* Nothing new, don't try to start */
map_update(&map, fd2devnum(mdfd),
content->array.working_disks) {
int err;
- if (content->reshape_active) {
+ if (start_reshape) {
int spare = content->array.raid_disks + expansion;
- int i;
- int *fdlist = malloc(sizeof(int) *
- (working + expansion
- + content->array.raid_disks));
- for (i=0; i<spare; i++)
- fdlist[i] = -1;
- for (dev = content->devs; dev; dev = dev->next) {
- char buf[20];
- int fd;
- sprintf(buf, "%d:%d",
- dev->disk.major,
- dev->disk.minor);
- fd = dev_open(buf, O_RDWR);
-
- if (dev->disk.raid_disk >= 0)
- fdlist[dev->disk.raid_disk] = fd;
- else
- fdlist[spare++] = fd;
- }
- err = Grow_restart(st, content, fdlist, spare,
- backup_file, verbose > 0);
- while (spare > 0) {
- spare--;
- if (fdlist[spare] >= 0)
- close(fdlist[spare]);
- }
- if (err) {
- fprintf(stderr, Name ": Failed to restore critical"
- " section for reshape - sorry.\n");
- if (!backup_file)
- fprintf(stderr, Name ": Possibly you need"
- " to specify a --backup-file\n");
+ if (restore_backup(st, content,
+ working,
+ spare, backup_file, 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_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;
}
- err = Grow_continue(mdfd, st, content, backup_file);
+ err = Grow_continue(mdfd, st, content, backup_file,
+ freeze_reshape);
} else switch(content->array.level) {
case LEVEL_LINEAR:
case LEVEL_MULTIPATH:
if (!err) {
if (!mdmon_running(st->container_dev))
start_mdmon(st->container_dev);
- ping_monitor(devnum2devname(st->container_dev));
+ ping_monitor_by_id(st->container_dev);
}
break;
}
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);
+
if (verbose >= 0) {
if (err)
- fprintf(stderr, Name
- ": array %s now has %d devices",
- chosen_name, working + preexist);
+ pr_err("array %s now has %d device%s",
+ chosen_name, working + preexist,
+ working + preexist == 1 ? "":"s");
else
- fprintf(stderr, Name
- ": Started %s with %d devices",
- chosen_name, working + preexist);
+ 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)
return err;
/* FIXME should have an O_EXCL and wait for read-auto */
} else {
- if (verbose >= 0)
- fprintf(stderr, Name
- ": %s assembled with %d devices but "
- "not started\n",
- chosen_name, working);
+ if (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;
}
}
projects / thirdparty / mdadm.git / blobdiff