X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Assemble.c;h=e1870fc5ab44961654c2d57a6a0d85709da75874;hp=b09021fca5e881752699e7a089cdfecf6f2630c0;hb=df0d4ea04e34fc5d499056b00fa1e0a25f21453e;hpb=98dbd96605fe7f995934ddc778f06e7b21dbcef4 diff --git a/Assemble.c b/Assemble.c index b09021fc..e1870fc5 100644 --- a/Assemble.c +++ b/Assemble.c @@ -1,7 +1,7 @@ /* * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2001-2006 Neil Brown + * Copyright (C) 2001-2009 Neil Brown * * * This program is free software; you can redistribute it and/or modify @@ -19,12 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: Neil Brown - * Email: - * Paper: Neil Brown - * School of Computer Science and Engineering - * The University of New South Wales - * Sydney, 2052 - * Australia + * Email: */ #include "mdadm.h" @@ -50,11 +45,36 @@ static int name_matches(char *found, char *required, char *homehost) return 0; } +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 *ent; + int busy = 0; + + for (ent = mdstat; ent; ent = ent->next) { + if (ent->metadata_version == NULL) + continue; + if (strncmp(ent->metadata_version, "external:", 9) != 0) + continue; + if (!is_subarray(&ent->metadata_version[9])) + continue; + /* Skip first char - it can be '/' or '-' */ + if (strcmp(&ent->metadata_version[10], metadata_version+1) == 0) { + busy = 1; + break; + } + } + free_mdstat(mdstat); + + return busy; +} + int Assemble(struct supertype *st, char *mddev, mddev_ident_t ident, mddev_dev_t devlist, char *backup_file, int readonly, int runstop, - char *update, char *homehost, + char *update, char *homehost, int require_homehost, int verbose, int force) { /* @@ -113,7 +133,9 @@ int Assemble(struct supertype *st, char *mddev, */ int mdfd; int clean; - int auto_assem = (mddev == NULL); + int auto_assem = (mddev == NULL && !ident->uuid_set && + ident->super_minor == UnSet && ident->name[0] == 0 + && (ident->container == NULL || ident->member == NULL)); int old_linux = 0; int vers = vers; /* Keep gcc quite - it really is initialised */ struct { @@ -133,6 +155,7 @@ int Assemble(struct supertype *st, char *mddev, int chosen_drive; int change = 0; int inargv = 0; + int report_missmatch; int bitmap_done; int start_partial_ok = (runstop >= 0) && (force || devlist==NULL || auto_assem); @@ -140,7 +163,6 @@ int Assemble(struct supertype *st, char *mddev, mddev_dev_t tmpdev; struct mdinfo info; struct mdinfo *content = NULL; - mdu_array_info_t tmp_inf; char *avail; int nextspare = 0; char *name = NULL; @@ -161,63 +183,20 @@ int Assemble(struct supertype *st, char *mddev, if (!devlist && ident->uuid_set == 0 && ident->super_minor < 0 && + 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"); return 1; } - /* if the configuration specifies a container then we use that to - * determine the devices and retrieve the array configuration - */ -#ifndef MDASSEMBLE - if (ident->container && ident->member) { - int cfd = open(ident->container, O_RDWR); - struct mdinfo *mdi; - struct supertype container; - - if (verbose>0) - fprintf(stderr, Name ": looking to assemble member array %s" - " inside container %s\n", ident->member, ident->container); - if (cfd < 0) { - if (verbose>0) - fprintf(stderr, Name ": unable to open container %s: %s\n", - ident->container, strerror(errno)); - return 1; - } - - mdi = sysfs_read(cfd, fd2devnum(cfd), GET_VERSION); - if (!mdi) { - close(cfd); - if (verbose>0) - fprintf(stderr, Name ": unable to read container %s\n", - ident->container); - return 1; - } - container.ss = find_metadata_methods(mdi->text_version); - sysfs_free(mdi); - if (!container.ss) { - close(cfd); - fprintf(stderr, Name ": %s uses unknown metadata: %s\n", - ident->container, mdi->text_version); - return 1; - } - if (container.ss->load_super(&container, cfd, ident->container)) { - fprintf(stderr, Name ": Cannot load metadata for container %s\n", - ident->container); - return 1; - } - - return Incremental_container(&container, ident->container, - verbose, runstop, ident->autof, - LOCAL); - } -#endif if (devlist == NULL) devlist = conf_get_devs(); else if (mddev) inargv = 1; + report_missmatch = ((inargv && verbose >= 0) || verbose > 0); 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 @@ -256,14 +235,14 @@ int Assemble(struct supertype *st, char *mddev, if (ident->devices && !match_oneof(ident->devices, devname)) { - if ((inargv && verbose>=0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": %s is not one of %s\n", devname, ident->devices); continue; } dfd = dev_open(devname, O_RDONLY|O_EXCL); if (dfd < 0) { - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": cannot open device %s: %s\n", devname, strerror(errno)); tmpdev->used = 2; @@ -277,12 +256,19 @@ int Assemble(struct supertype *st, char *mddev, devname); tmpdev->used = 2; } else if (!tst && (tst = guess_super(dfd)) == NULL) { - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": no recogniseable superblock on %s\n", devname); tmpdev->used = 2; + } else if (auto_assem && st == NULL && + !conf_test_metadata(tst->ss->name)) { + if (report_missmatch) + fprintf(stderr, Name ": %s has metadata type %s for which " + "auto-assembly is disabled\n", + devname, tst->ss->name); + tmpdev->used = 2; } else if (tst->ss->load_super(tst,dfd, NULL)) { - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf( stderr, Name ": no RAID superblock on %s\n", devname); } else { @@ -292,10 +278,71 @@ int Assemble(struct supertype *st, char *mddev, } if (dfd >= 0) close(dfd); + if (tst && tst->sb && tst->ss->container_content + && tst->loaded_container) { + /* tmpdev is a container. We need to be either + * looking for a member, or auto-assembling + */ + if (st) { + /* already found some components, this cannot + * be another one. + */ + if (report_missmatch) + fprintf(stderr, Name ": %s is a container, but we are looking for components\n", + devname); + goto loop; + } + + 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", + devname, ident->container); + goto loop; + } + if (ident->container[0] != '/') { + /* we have a uuid */ + int uuid[4]; + 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", + devname); + goto loop; + } + } + } + /* It is worth looking inside this container. + */ + if (verbose > 0) + fprintf(stderr, Name ": looking in container %s\n", + devname); + next_member: + if (tmpdev->content) + content = tmpdev->content; + else + content = tst->ss->container_content(tst); + if (!content) + goto loop; /* empty container */ + + tmpdev->content = content->next; + if (tmpdev->content == NULL) + tmpdev->used = 2; + + } else if (ident->container || ident->member) { + /* No chance of this matching if we don't have + * a container */ + if (report_missmatch) + fprintf(stderr, Name "%s is not a container, and one is required.\n", + devname); + goto loop; + } + if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) && (!tst || !tst->sb || same_uuid(content->uuid, ident->uuid, tst->ss->swapuuid)==0)) { - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": %s has wrong uuid.\n", devname); goto loop; @@ -303,7 +350,7 @@ int Assemble(struct supertype *st, char *mddev, if (ident->name[0] && (!update || strcmp(update, "name")!= 0) && (!tst || !tst->sb || name_matches(content->name, ident->name, homehost)==0)) { - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": %s has wrong name.\n", devname); goto loop; @@ -311,7 +358,7 @@ int Assemble(struct supertype *st, char *mddev, if (ident->super_minor != UnSet && (!tst || !tst->sb || ident->super_minor != content->array.md_minor)) { - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": %s has wrong super-minor.\n", devname); goto loop; @@ -319,7 +366,7 @@ int Assemble(struct supertype *st, char *mddev, if (ident->level != UnSet && (!tst || !tst->sb || ident->level != content->array.level)) { - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": %s has wrong raid level.\n", devname); goto loop; @@ -327,7 +374,7 @@ int Assemble(struct supertype *st, char *mddev, if (ident->raid_disks != UnSet && (!tst || !tst->sb || ident->raid_disks!= content->array.raid_disks)) { - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": %s requires wrong number of drives.\n", devname); goto loop; @@ -351,6 +398,54 @@ int Assemble(struct supertype *st, char *mddev, return 1; } + if (tst && tst->sb && tst->ss->container_content + && tst->loaded_container) { + /* we have the one container we need, don't keep + * looking. If the chosen member is active, skip. + */ + if (is_member_busy(content->text_version)) { + if (report_missmatch) + fprintf(stderr, Name ": member %s in %s is already assembled\n", + content->text_version, + devname); + skip: + if (tmpdev->content) + goto next_member; + tst->ss->free_super(tst); + tst = NULL; + content = NULL; + if (auto_assem) + goto loop; + return 1; + } + if (ident->member && ident->member[0]) { + char *s = strchr(content->text_version+1, '/'); + if (s == NULL) { + fprintf(stderr, Name ": badly formatted version: %s\n", + content->text_version); + goto skip; + } + if (strcmp(ident->member, s+1) != 0) { + if (report_missmatch) + fprintf(stderr, + Name ": skipping wrong member %s\n", + content->text_version); + goto skip; + } + } + st = tst; tst = NULL; + if (!auto_assem && tmpdev->next != NULL) { + fprintf(stderr, Name ": %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", + content->text_version, devname); + break; + } if (st == NULL) st = dup_super(tst); if (st->minor_version == -1) @@ -372,13 +467,13 @@ int Assemble(struct supertype *st, char *mddev, (first == 1 || last == 1)) { /* We can do something */ if (first) {/* just ignore this one */ - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": %s misses out due to wrong homehost\n", devname); goto loop; } else { /* reject all those sofar */ mddev_dev_t td; - if ((inargv && verbose >= 0) || verbose > 0) + if (report_missmatch) fprintf(stderr, Name ": %s overrides previous devices due to good homehost\n", devname); for (td=devlist; td != tmpdev; td=td->next) @@ -399,6 +494,8 @@ int Assemble(struct supertype *st, char *mddev, tmpdev->used = 1; loop: + if (tmpdev->content) + goto next_member; if (tst) tst->ss->free_super(tst); } @@ -406,16 +503,14 @@ int Assemble(struct supertype *st, char *mddev, if (!st || !st->sb || !content) return 2; - /* Now need to open array the device. Use create_mddev */ + /* Now need to open the array device. Use create_mddev */ if (content == &info) st->ss->getinfo_super(st, content); trustworthy = FOREIGN; - switch (st->ss->match_home(st, homehost)) { - case 0: - trustworthy = FOREIGN; - name = content->name; - break; + name = content->name; + switch (st->ss->match_home(st, homehost) + ?: st->ss->match_home(st, "any")) { case 1: trustworthy = LOCAL; name = strchr(content->name, ':'); @@ -424,22 +519,30 @@ int Assemble(struct supertype *st, char *mddev, else name = content->name; break; - case -1: - trustworthy = FOREIGN; - break; } - if (!auto_assem && trustworthy == FOREIGN) - /* If the array is listed in mdadm or on + if (!auto_assem) + /* If the array is listed in mdadm.conf or on * command line, then we trust the name * even if the array doesn't look local */ trustworthy = LOCAL; - if (content->name[0] == 0 && + if (name[0] == 0 && content->array.level == LEVEL_CONTAINER) { name = content->text_version; trustworthy = METADATA; } + + if (name[0] && trustworthy != LOCAL && + ! require_homehost && + conf_name_is_free(name)) + trustworthy = LOCAL; + + if (trustworthy == LOCAL && + strchr(name, ':')) + /* Ignore 'host:' prefix of name */ + name = strchr(name, ':')+1; + mdfd = create_mddev(mddev, name, ident->autof, trustworthy, chosen_name); if (mdfd < 0) { @@ -457,7 +560,7 @@ int Assemble(struct supertype *st, char *mddev, close(mdfd); return 1; } - if (ioctl(mdfd, GET_ARRAY_INFO, &tmp_inf)==0) { + if (mddev_busy(fd2devnum(mdfd))) { fprintf(stderr, Name ": %s already active, cannot restart it!\n", mddev); for (tmpdev = devlist ; @@ -477,8 +580,16 @@ int Assemble(struct supertype *st, char *mddev, } ioctl(mdfd, STOP_ARRAY, NULL); /* just incase it was started but has no content */ +#ifndef MDASSEMBLE + if (content != &info) { + /* This is a member of a container. Try starting the array. */ + return assemble_container_content(st, mdfd, content, runstop, + chosen_name, verbose); + } +#endif /* Ok, no bad inconsistancy, we can try updating etc */ bitmap_done = 0; + content->update_private = NULL; for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) if (tmpdev->used == 1) { char *devname = tmpdev->devname; struct stat stb; @@ -572,7 +683,7 @@ int Assemble(struct supertype *st, char *mddev, > devices[most_recent].i.events) most_recent = devcnt; } - if (content->array.level == -4) + if (content->array.level == LEVEL_MULTIPATH) /* with multipath, the raid_disk from the superblock is meaningless */ i = devcnt; else @@ -631,6 +742,8 @@ int Assemble(struct supertype *st, char *mddev, } devcnt++; } + free(content->update_private); + content->update_private = NULL; if (devcnt == 0) { fprintf(stderr, Name ": no devices found for %s\n", @@ -663,8 +776,8 @@ int Assemble(struct supertype *st, char *mddev, /* note: we ignore error flags in multipath arrays * as they don't make sense */ - if (content->array.level != -4) - if (!(devices[j].i.disk.state & (1<array.level != LEVEL_MULTIPATH) + if (!(devices[j].i.disk.state & (1<=0 && !devices[j].uptodate && - devices[j].i.events > 0 && (chosen_drive < 0 || devices[j].i.events > devices[chosen_drive].i.events)) @@ -753,7 +865,6 @@ int Assemble(struct supertype *st, char *mddev, int j = best[i]; if (j >= 0 && !devices[j].uptodate && - devices[j].i.events > 0 && devices[j].i.events == current_events) { chosen_drive = j; goto add_another; @@ -817,6 +928,8 @@ int Assemble(struct supertype *st, char *mddev, continue; devices[j].i.disk.state = desired_state; + if (!(devices[j].i.array.state & 1)) + clean = 0; if (st->ss->update_super(st, &devices[j].i, "assemble", NULL, verbose, 0, NULL)) { @@ -877,6 +990,10 @@ int Assemble(struct supertype *st, char *mddev, if (content->reshape_active) { int err = 0; int *fdlist = malloc(sizeof(int)* bestcnt); + if (verbose) + fprintf(stderr, Name ":%s has an active reshape - checking " + "if critical section needs to be restored\n", + chosen_name); for (i=0; i= 0) { @@ -891,13 +1008,15 @@ int Assemble(struct supertype *st, char *mddev, fdlist[i] = -1; } if (!err) - err = Grow_restart(st, content, fdlist, bestcnt, backup_file); + err = Grow_restart(st, content, fdlist, bestcnt, backup_file, verbose); while (i>0) { i--; if (fdlist[i]>=0) close(fdlist[i]); } if (err) { fprintf(stderr, Name ": Failed to restore critical section for reshape, sorry.\n"); + if (backup_file == NULL) + fprintf(stderr," Possibly you needed to specify the --backup-file\n"); close(mdfd); return err; } @@ -995,6 +1114,7 @@ int Assemble(struct supertype *st, char *mddev, fprintf(stderr, "\n"); } sysfs_uevent(content, "change"); + wait_for(chosen_name, mdfd); close(mdfd); return 0; } @@ -1005,7 +1125,20 @@ int Assemble(struct supertype *st, char *mddev, content->array.layout, clean, avail, okcnt) && (okcnt >= req_cnt || start_partial_ok) ))) { - if (ioctl(mdfd, RUN_ARRAY, NULL)==0) { + /* This array is good-to-go. + * If a reshape is in progress then we might need to + * continue monitoring it. In that case we start + * it read-only and let the grow code make it writable. + */ + int rv; +#ifndef MDASSEMBLE + if (content->reshape_active && + content->delta_disks <= 0) + rv = Grow_continue(mdfd, st, content, backup_file); + 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", mddev, okcnt, okcnt==1?"":"s"); @@ -1015,6 +1148,21 @@ int Assemble(struct supertype *st, char *mddev, fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s"); fprintf(stderr, ".\n"); } + if (content->reshape_active && + content->array.level >= 4 && + content->array.level <= 6) { + /* might need to increase the size + * of the stripe cache - default is 256 + */ + if (256 < 4 * (content->array.chunk_size/4096)) { + struct mdinfo *sra = sysfs_read(mdfd, 0, 0); + if (sra) + sysfs_set_num(sra, NULL, + "stripe_cache_size", + (4 * content->array.chunk_size / 4096) + 1); + } + } + wait_for(mddev, mdfd); close(mdfd); if (auto_assem) { int usecs = 1; @@ -1097,6 +1245,7 @@ int Assemble(struct supertype *st, char *mddev, } if (auto_assem) ioctl(mdfd, STOP_ARRAY, NULL); + close(mdfd); return 1; } else { /* The "chosen_drive" is a good choice, and if necessary, the superblock has @@ -1115,3 +1264,92 @@ int Assemble(struct supertype *st, char *mddev, close(mdfd); return 0; } + +#ifndef MDASSEMBLE +int assemble_container_content(struct supertype *st, int mdfd, + struct mdinfo *content, int runstop, + char *chosen_name, int verbose) +{ + struct mdinfo *dev, *sra; + int working = 0, preexist = 0; + struct map_ent *map = NULL; + + 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) { + close(mdfd); + return 1; + } + if (sra) + sysfs_free(sra); + + for (dev = content->devs; dev; dev = dev->next) + if (sysfs_add_disk(content, dev, 1) == 0) + working++; + else if (errno == EEXIST) + preexist++; + if (working == 0) { + close(mdfd); + return 1;/* Nothing new, don't try to start */ + } + + map_update(&map, fd2devnum(mdfd), + content->text_version, + content->uuid, chosen_name); + + if (runstop > 0 || + (working + preexist) >= content->array.working_disks) { + int err; + + switch(content->array.level) { + case LEVEL_LINEAR: + case LEVEL_MULTIPATH: + case 0: + err = sysfs_set_str(content, NULL, "array_state", + "active"); + break; + default: + err = sysfs_set_str(content, NULL, "array_state", + "readonly"); + /* start mdmon if needed. */ + if (!err) { + if (!mdmon_running(st->container_dev)) + start_mdmon(st->container_dev); + ping_monitor(devnum2devname(st->container_dev)); + } + break; + } + if (!err) + sysfs_set_safemode(content, content->safe_mode_delay); + if (verbose >= 0) { + if (err) + fprintf(stderr, Name + ": array %s now has %d devices", + chosen_name, working + preexist); + else + fprintf(stderr, Name + ": Started %s with %d devices", + chosen_name, working + preexist); + if (preexist) + fprintf(stderr, " (%d new)", working); + fprintf(stderr, "\n"); + } + if (!err) + wait_for(chosen_name, mdfd); + close(mdfd); + return 0; + /* 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); + close(mdfd); + return 1; + } +} +#endif +