X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Incremental.c;h=054040d6dd4b2e4bb6bccb84fbbe73bbfcaccf6c;hb=9008ed1c9623b7c11775ea8a7be17eb1bde5fd09;hp=9b22220604fc463f9fbba2ebc7fb493ac7d41ac7;hpb=37ea3936a696c2b102963ba5117165ef6be8d4b4;p=thirdparty%2Fmdadm.git diff --git a/Incremental.c b/Incremental.c index 9b222206..054040d6 100644 --- a/Incremental.c +++ b/Incremental.c @@ -48,7 +48,8 @@ int Incremental(char *devname, int verbose, int runstop, * 2/ Find metadata, reject if none appropriate (check * version/name from args) * 3/ Check if there is a match in mdadm.conf - * 3a/ if not, check for homehost match. If no match, reject. + * 3a/ if not, check for homehost match. If no match, assemble as + * a 'foreign' array. * 4/ Determine device number. * - If in mdadm.conf with std name, use that * - UUID in /var/run/mdadm.map use that @@ -56,6 +57,7 @@ int Incremental(char *devname, int verbose, int runstop, * - Choose a free, high number. * - Use a partitioned device unless strong suggestion not to. * e.g. auto=md + * Don't choose partitioned for containers. * 5/ Find out if array already exists * 5a/ if it does not * - choose a name, from mdadm.conf or 'name' field in array. @@ -67,6 +69,7 @@ int Incremental(char *devname, int verbose, int runstop, * - add the device * 6/ Make sure /var/run/mdadm.map contains this array. * 7/ Is there enough devices to possibly start the array? + * For a container, this means running Incremental_container. * 7a/ if not, finish with success. * 7b/ if yes, * - read all metadata and arrange devices like -A does @@ -74,23 +77,22 @@ int Incremental(char *devname, int verbose, int runstop, * start the array (auto-readonly). */ struct stat stb; - struct mdinfo info, info2; + struct mdinfo info; struct mddev_ident_s *array_list, *match; char chosen_name[1024]; int rv; - int devnum; struct map_ent *mp, *map = NULL; int dfd, mdfd; char *avail; int active_disks; - + int trustworthy = FOREIGN; + char *name_to_use; + mdu_array_info_t ainf; struct createinfo *ci = conf_get_create_info(); - if (autof == 0) - autof = ci->autof; - /* 1/ Check if devices is permitted by mdadm.conf */ + /* 1/ Check if device is permitted by mdadm.conf */ if (!conf_test_dev(devname)) { if (verbose >= 0) @@ -142,14 +144,7 @@ int Incremental(char *devname, int verbose, int runstop, } close (dfd); - if (st->ss->container_content) { - /* This is a pre-built container array, so we do something - * rather different. - */ - return Incremental_container(st, devname, verbose, runstop, - autof); - } - + memset(&info, 0, sizeof(info)); st->ss->getinfo_super(st, &info); /* 3/ Check if there is a match in mdadm.conf */ @@ -159,7 +154,7 @@ int Incremental(char *devname, int verbose, int runstop, if (array_list->uuid_set && same_uuid(array_list->uuid, info.uuid, st->ss->swapuuid) == 0) { - if (verbose >= 2) + if (verbose >= 2 && array_list->devname) fprintf(stderr, Name ": UUID differs from %s.\n", array_list->devname); @@ -167,7 +162,7 @@ int Incremental(char *devname, int verbose, int runstop, } if (array_list->name[0] && strcasecmp(array_list->name, info.name) != 0) { - if (verbose >= 2) + if (verbose >= 2 && array_list->devname) fprintf(stderr, Name ": Name differs from %s.\n", array_list->devname); @@ -175,7 +170,7 @@ int Incremental(char *devname, int verbose, int runstop, } if (array_list->devices && !match_oneof(array_list->devices, devname)) { - if (verbose >= 2) + if (verbose >= 2 && array_list->devname) fprintf(stderr, Name ": Not a listed device for %s.\n", array_list->devname); @@ -183,7 +178,7 @@ int Incremental(char *devname, int verbose, int runstop, } if (array_list->super_minor != UnSet && array_list->super_minor != info.array.md_minor) { - if (verbose >= 2) + if (verbose >= 2 && array_list->devname) fprintf(stderr, Name ": Different super-minor to %s.\n", array_list->devname); @@ -193,7 +188,7 @@ int Incremental(char *devname, int verbose, int runstop, !array_list->name[0] && !array_list->devices && array_list->super_minor == UnSet) { - if (verbose >= 2) + if (verbose >= 2 && array_list->devname) fprintf(stderr, Name ": %s doesn't have any identifying information.\n", array_list->devname); @@ -202,130 +197,93 @@ int Incremental(char *devname, int verbose, int runstop, /* FIXME, should I check raid_disks and level too?? */ if (match) { - if (verbose >= 0) - fprintf(stderr, Name + if (verbose >= 0) { + if (match->devname && array_list->devname) + fprintf(stderr, Name ": we match both %s and %s - cannot decide which to use.\n", - match->devname, array_list->devname); + match->devname, array_list->devname); + else + fprintf(stderr, Name + ": multiple lines in mdadm.conf match\n"); + } return 2; } match = array_list; } - /* 3a/ if not, check for homehost match. If no match, reject. */ - if (!match) { - if (homehost == NULL || - st->ss->match_home(st, homehost) == 0) { - if (verbose >= 0) - fprintf(stderr, Name - ": not found in mdadm.conf and not identified by homehost.\n"); - return 2; - } - } - /* 4/ Determine device number. */ - /* - If in mdadm.conf with std name, use that */ - /* - UUID in /var/run/mdadm.map use that */ - /* - If name is suggestive, use that. unless in use with */ - /* different uuid. */ - /* - Choose a free, high number. */ - /* - Use a partitioned device unless strong suggestion not to. */ - /* e.g. auto=md */ - if (match && is_standard(match->devname, &devnum)) - /* We have devnum now */; - else if ((mp = map_by_uuid(&map, info.uuid)) != NULL) - devnum = mp->devnum; - else { - /* Have to guess a bit. */ - int use_partitions = 1; - char *np, *ep; - char *nm, nbuf[1024]; - if ((autof&7) == 3 || (autof&7) == 5) - use_partitions = 0; - np = strchr(info.name, ':'); - if (np) - np++; - else - np = info.name; - devnum = strtoul(np, &ep, 10); - if (ep > np && *ep == 0) { - /* This is a number. Let check that it is unused. */ - if (mddev_busy(use_partitions ? (-1-devnum) : devnum)) - devnum = -1; - } else - devnum = -1; - - if (match) - nm = match->devname; - else { - sprintf(nbuf, "/dev/md/%s", np); - nm = nbuf; - } - if (stat(nm, &stb) == 0 && - S_ISBLK(stb.st_mode) && - major(stb.st_rdev) == (use_partitions ? - get_mdp_major() : MD_MAJOR)) { - if (use_partitions) - devnum = minor(stb.st_rdev) >> MdpMinorShift; - else - devnum = minor(stb.st_rdev); - if (mddev_busy(use_partitions ? (-1-devnum) : devnum)) - devnum = -1; - } - - if (devnum < 0) { - /* Haven't found anything yet, choose something free */ - devnum = find_free_devnum(use_partitions); + /* 3a/ if not, check for homehost match. If no match, continue + * but don't trust the 'name' in the array. Thus a 'random' minor + * number will be assigned, and the device name will be based + * on that. */ + if (match) + trustworthy = LOCAL; + else if (homehost == NULL || + st->ss->match_home(st, homehost) != 1) + trustworthy = FOREIGN; + name_to_use = strchr(info.name, ':'); + if (name_to_use) + name_to_use++; + else + name_to_use = info.name; + + /* There are three possible sources for 'autof': command line, + * ARRAY line in mdadm.conf, or CREATE line in mdadm.conf. + * ARRAY takes precedence, then command line, then + * CREATE. + */ + if (match && match->autof) + autof = match->autof; + if (autof == 0) + autof = ci->autof; - if (devnum == NoMdDev) { - fprintf(stderr, Name - ": No spare md devices!!\n"); - return 2; - } - } else - devnum = use_partitions ? (-1-devnum) : devnum; + if (st->ss->container_content && st->loaded_container) { + /* This is a pre-built container array, so we do something + * rather different. + */ + return Incremental_container(st, devname, verbose, runstop, + autof, trustworthy); } - mdfd = open_mddev_devnum(match ? match->devname : NULL, - devnum, - info.name, - chosen_name, autof >> 3); + /* 4/ Check if array exists. + */ + map_lock(&map); + mp = map_by_uuid(&map, info.uuid); + if (mp) + mdfd = open_mddev(mp->path, 0); + else + mdfd = -1; + if (mdfd < 0) { - fprintf(stderr, Name ": failed to open %s: %s.\n", - chosen_name, strerror(errno)); - return 2; - } - /* 5/ Find out if array already exists */ - if (! mddev_busy(devnum)) { - /* 5a/ if it does not */ - /* - choose a name, from mdadm.conf or 'name' field in array. */ - /* - create the array */ - /* - add the device */ - mdu_array_info_t ainf; - mdu_disk_info_t disk; struct mdinfo *sra; + struct mdinfo dinfo; - memset(&ainf, 0, sizeof(ainf)); - ainf.major_version = info.array.major_version; - ainf.minor_version = info.array.minor_version; - if (ioctl(mdfd, SET_ARRAY_INFO, &ainf) != 0) { - fprintf(stderr, Name - ": SET_ARRAY_INFO failed for %s: %s\b", + /* Couldn't find an existing array, maybe make a new one */ + mdfd = create_mddev(mp ? mp->path : match ? match->devname : NULL, + info.name, autof, trustworthy, chosen_name); + + + if (mdfd < 0) + return 1; + + sysfs_init(&info, mdfd, 0); + + if (set_array_info(mdfd, st, &info) != 0) { + fprintf(stderr, Name ": failed to set array info for %s: %s\n", chosen_name, strerror(errno)); close(mdfd); return 2; } - sra = sysfs_read(mdfd, devnum, GET_VERSION); - sysfs_set_str(sra, NULL, "metadata_version", info.text_version); - memset(&disk, 0, sizeof(disk)); - disk.major = major(stb.st_rdev); - disk.minor = minor(stb.st_rdev); - sysfs_free(sra); - if (ioctl(mdfd, ADD_NEW_DISK, &disk) != 0) { + + dinfo = info; + dinfo.disk.major = major(stb.st_rdev); + dinfo.disk.minor = minor(stb.st_rdev); + if (add_disk(mdfd, st, &info, &dinfo) != 0) { fprintf(stderr, Name ": failed to add %s to %s: %s.\n", devname, chosen_name, strerror(errno)); ioctl(mdfd, STOP_ARRAY, 0); close(mdfd); return 2; } - sra = sysfs_read(mdfd, devnum, GET_DEVS); + sra = sysfs_read(mdfd, fd2devnum(mdfd), GET_DEVS); if (!sra || !sra->devs || sra->devs->disk.raid_disk >= 0) { /* It really should be 'none' - must be old buggy * kernel, and mdadm -I may not be able to complete. @@ -339,6 +297,12 @@ int Incremental(char *devname, int verbose, int runstop, sysfs_free(sra); return 2; } + info.array.working_disks = 1; + sysfs_free(sra); + /* 6/ Make sure /var/run/mdadm.map contains this array. */ + map_update(&map, fd2devnum(mdfd), + info.text_version, + info.uuid, chosen_name); } else { /* 5b/ if it does */ /* - check one drive in array to make sure metadata is a reasonably */ @@ -346,11 +310,14 @@ int Incremental(char *devname, int verbose, int runstop, /* - add the device */ char dn[20]; int dfd2; - mdu_disk_info_t disk; int err; struct mdinfo *sra; struct supertype *st2; - sra = sysfs_read(mdfd, devnum, (GET_DEVS | GET_STATE)); + struct mdinfo info2, *d; + + strcpy(chosen_name, mp->path); + + sra = sysfs_read(mdfd, fd2devnum(mdfd), (GET_DEVS | GET_STATE)); sprintf(dn, "%d:%d", sra->devs->disk.major, sra->devs->disk.minor); @@ -367,6 +334,7 @@ int Incremental(char *devname, int verbose, int runstop, return 2; } close(dfd2); + memset(&info2, 0, sizeof(info2)); st2->ss->getinfo_super(st2, &info2); st2->ss->free_super(st2); if (info.array.level != info2.array.level || @@ -378,17 +346,19 @@ int Incremental(char *devname, int verbose, int runstop, close(mdfd); return 2; } - memset(&disk, 0, sizeof(disk)); - disk.major = major(stb.st_rdev); - disk.minor = minor(stb.st_rdev); - err = ioctl(mdfd, ADD_NEW_DISK, &disk); + info2.disk.major = major(stb.st_rdev); + info2.disk.minor = minor(stb.st_rdev); + /* add disk needs to know about containers */ + if (st->ss->external) + sra->array.level = LEVEL_CONTAINER; + err = add_disk(mdfd, st2, sra, &info2); if (err < 0 && errno == EBUSY) { /* could be another device present with the same * disk.number. Find and reject any such */ find_reject(mdfd, st, sra, info.disk.number, info.events, verbose, chosen_name); - err = ioctl(mdfd, ADD_NEW_DISK, &disk); + err = add_disk(mdfd, st2, sra, &info2); } if (err < 0) { fprintf(stderr, Name ": failed to add %s to %s: %s.\n", @@ -396,14 +366,26 @@ int Incremental(char *devname, int verbose, int runstop, close(mdfd); return 2; } + info.array.working_disks = 0; + for (d = sra->devs; d; d=d->next) + info.array.working_disks ++; + } - /* 6/ Make sure /var/run/mdadm.map contains this array. */ - map_update(&map, devnum, - info.text_version, - info.uuid, chosen_name); /* 7/ Is there enough devices to possibly start the array? */ /* 7a/ if not, finish with success. */ + if (info.array.level == LEVEL_CONTAINER) { + /* Try to assemble within the container */ + close(mdfd); + map_unlock(&map); + sysfs_uevent(&info, "change"); + if (verbose >= 0) + fprintf(stderr, Name + ": container %s now has %d devices\n", + chosen_name, info.array.working_disks); + return Incremental(chosen_name, verbose, runstop, + NULL, homehost, autof); + } avail = NULL; active_disks = count_active(st, mdfd, &avail, &info); if (enough(info.array.level, info.array.raid_disks, @@ -414,6 +396,7 @@ int Incremental(char *devname, int verbose, int runstop, fprintf(stderr, Name ": %s attached to %s, not enough to start (%d).\n", devname, chosen_name, active_disks); + map_unlock(&map); close(mdfd); return 0; } @@ -424,18 +407,18 @@ int Incremental(char *devname, int verbose, int runstop, /* are enough, */ /* + add any bitmap file */ /* + start the array (auto-readonly). */ -{ - mdu_array_info_t ainf; if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) { if (verbose >= 0) fprintf(stderr, Name ": %s attached to %s which is already active.\n", devname, chosen_name); - close (mdfd); + close(mdfd); + map_unlock(&map); return 0; } -} + + map_unlock(&map); if (runstop > 0 || active_disks >= info.array.working_disks) { struct mdinfo *sra; /* Let's try to start it */ @@ -458,8 +441,9 @@ int Incremental(char *devname, int verbose, int runstop, } close(bmfd); } - sra = sysfs_read(mdfd, devnum, 0); - if (sra == NULL || active_disks >= info.array.working_disks) + sra = sysfs_read(mdfd, fd2devnum(mdfd), 0); + if ((sra == NULL || active_disks >= info.array.working_disks) + && trustworthy != FOREIGN) rv = ioctl(mdfd, RUN_ARRAY, NULL); else rv = sysfs_set_str(sra, NULL, @@ -556,12 +540,18 @@ static int count_active(struct supertype *st, int mdfd, char **availp, if (ok != 0) continue; st->ss->getinfo_super(st, &info); + if (!avail) { + avail = malloc(info.array.raid_disks); + if (!avail) { + fprintf(stderr, Name ": out of memory.\n"); + exit(1); + } + memset(avail, 0, info.array.raid_disks); + *availp = avail; + } + if (info.disk.state & (1<ss->free_super(st); break; } + sysfs_free(sra); } map_write(map); map_free(map); + for (md = mdstat ; md ; md = md->next) { + struct mdinfo *sra = sysfs_read(-1, md->devnum, GET_VERSION); + sysfs_uevent(sra, "change"); + sysfs_free(sra); + } } int IncrementalScan(int verbose) @@ -661,12 +657,11 @@ int IncrementalScan(int verbose) devs = conf_get_ident(NULL); for (me = mapl ; me ; me = me->next) { - char path[1024]; mdu_array_info_t array; mdu_bitmap_file_t bmf; struct mdinfo *sra; - int mdfd = open_mddev_devnum(me->path, me->devnum, - NULL, path, 0); + int mdfd = open_mddev(me->path, 0); + if (mdfd < 0) continue; if (ioctl(mdfd, GET_ARRAY_INFO, &array) == 0 || @@ -676,7 +671,8 @@ int IncrementalScan(int verbose) } /* Ok, we can try this one. Maybe it needs a bitmap */ for (mddev = devs ; mddev ; mddev = mddev->next) - if (strcmp(mddev->devname, me->path) == 0) + if (mddev->devname + && strcmp(mddev->devname, me->path) == 0) break; if (mddev && mddev->bitmap_file) { /* @@ -724,19 +720,31 @@ int IncrementalScan(int verbose) static char *container2devname(char *devname) { - int fd = open(devname, O_RDONLY); char *mdname = NULL; - if (fd >= 0) { - mdname = devnum2devname(fd2devnum(fd)); - close(fd); + if (devname[0] == '/') { + int fd = open(devname, O_RDONLY); + if (fd >= 0) { + mdname = devnum2devname(fd2devnum(fd)); + close(fd); + } + } else { + int uuid[4]; + struct map_ent *mp, *map = NULL; + + if (!parse_uuid(devname, uuid)) + return mdname; + mp = map_by_uuid(&map, uuid); + if (mp) + mdname = devnum2devname(mp->devnum); + map_free(map); } return mdname; } int Incremental_container(struct supertype *st, char *devname, int verbose, - int runstop, int autof) + int runstop, int autof, int trustworthy) { /* Collect the contents of this container and for each * array, choose a device name and assemble the array. @@ -744,69 +752,65 @@ int Incremental_container(struct supertype *st, char *devname, int verbose, struct mdinfo *list = st->ss->container_content(st); struct mdinfo *ra; - char *mdname = container2devname(devname); + struct map_ent *map = NULL; - if (!mdname) { - fprintf(stderr, Name": failed to determine device name\n"); - return 2; - } + map_lock(&map); for (ra = list ; ra ; ra = ra->next) { - struct mdinfo *sra; - struct mdinfo *dev; - int devnum = -1; int mdfd; char chosen_name[1024]; - int usepart = 1; - char *n; - int working = 0; - char ver[100]; - - if ((autof&7) == 3 || (autof&7) == 5) - usepart = 0; - - n = ra->name; - if (*n == 'd') - n++; - if (*n) { - devnum = strtoul(n, &n, 10); - if (devnum >= 0 && (*n == 0 || *n == ' ')) { - /* Use this devnum */ - usepart = (ra->name[0] == 'd'); - if (mddev_busy(usepart ? (-1-devnum) : devnum)) - devnum = -1; - } else - devnum = -1; - } + struct map_ent *mp; + struct mddev_ident_s *match = NULL; + int err; - if (devnum < 0) { - char *nm = ra->name; - char nbuf[1024]; - struct stat stb; - if (strchr(nm, ':')) - nm = strchr(nm, ':')+1; - sprintf(nbuf, "/dev/md/%s", nm); - - if (stat(nbuf, &stb) == 0 && - S_ISBLK(stb.st_mode) && - major(stb.st_rdev) == (usepart ? - get_mdp_major() : MD_MAJOR)){ - if (usepart) - devnum = minor(stb.st_rdev) - >> MdpMinorShift; - else - devnum = minor(stb.st_rdev); - if (mddev_busy(usepart ? (-1-devnum) : devnum)) - devnum = -1; + mp = map_by_uuid(&map, ra->uuid); + + if (!mp) { + + /* Check in mdadm.conf for devices == devname and + * member == ra->text_version after second slash. + */ + char *sub = strchr(ra->text_version+1, '/'); + struct mddev_ident_s *array_list; + if (sub) { + sub++; + array_list = conf_get_ident(NULL); + } else + array_list = NULL; + for(; array_list ; array_list = array_list->next) { + char *dn; + if (array_list->member == NULL || + array_list->container == NULL) + continue; + if (strcmp(array_list->member, sub) != 0) + continue; + if (array_list->uuid_set && + !same_uuid(ra->uuid, array_list->uuid, st->ss->swapuuid)) + continue; + dn = container2devname(array_list->container); + if (dn == NULL) + continue; + if (strncmp(dn, ra->text_version+1, + strlen(dn)) != 0 || + ra->text_version[strlen(dn)+1] != '/') { + free(dn); + continue; + } + free(dn); + /* we have a match */ + match = array_list; + if (verbose>0) + fprintf(stderr, Name ": match found for member %s\n", + array_list->member); + break; } } - if (devnum >= 0) - devnum = usepart ? (-1-devnum) : devnum; - else - devnum = find_free_devnum(usepart); - mdfd = open_mddev_devnum(NULL, devnum, ra->name, - chosen_name, autof>>3); + mdfd = create_mddev(match ? match->devname : NULL, + ra->name, + autof, + trustworthy, + chosen_name); if (mdfd < 0) { fprintf(stderr, Name ": failed to open %s: %s.\n", @@ -814,43 +818,12 @@ int Incremental_container(struct supertype *st, char *devname, int verbose, return 2; } - sra = sysfs_read(mdfd, 0, 0); - - sprintf(ver, "external:%s", ra->text_version); - sysfs_set_str(sra, NULL, "metadata_version", ver); - - sysfs_set_array(sra, ra); - for (dev = ra->devs; dev; dev = dev->next) - if (sysfs_add_disk(sra, dev) == 0) - working++; - - if (runstop > 0 || working >= ra->array.working_disks) { - switch(ra->array.level) { - case LEVEL_LINEAR: - case LEVEL_MULTIPATH: - case 0: - sysfs_set_str(sra, NULL, "array_state", - "active"); - break; - default: - sysfs_set_str(sra, NULL, "array_state", - "readonly"); - /* start mdmon if needed. */ - if (!mdmon_running(st->container_dev)) - start_mdmon(st->container_dev); - ping_monitor(devnum2devname(st->container_dev)); - break; - } - if (verbose >= 0) - printf("Started %s with %d devices\n", - chosen_name, working); - /* FIXME should have an O_EXCL and wait for read-auto */ - } else - if (verbose >= 0) - printf("%s assembled with %d devices but " - "not started\n", - chosen_name, working); + err = assemble_container_content(st, mdfd, ra, runstop, + chosen_name, verbose); close(mdfd); + if (err) + return err; } + map_unlock(&map); return 0; }