X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Incremental.c;h=b6f527ab518193aa7b492d4ff5010968346ff306;hb=2400e6eb21af93368824110d087708dc9c48f744;hp=43b1f77638a2977e73126355591eabe8c4c5d615;hpb=78fbcc10312649f2f4f88283e3f19dce9b205733;p=thirdparty%2Fmdadm.git diff --git a/Incremental.c b/Incremental.c index 43b1f776..b6f527ab 100644 --- a/Incremental.c +++ b/Incremental.c @@ -37,7 +37,8 @@ static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra, char *array_name); int Incremental(char *devname, int verbose, int runstop, - struct supertype *st, char *homehost, int autof) + struct supertype *st, char *homehost, int require_homehost, + int autof) { /* Add this device to an array, creating the array if necessary * and starting the array if sensible or - if runstop>0 - if possible. @@ -211,20 +212,36 @@ int Incremental(char *devname, int verbose, int runstop, match = array_list; } + if (match && match->devname + && strcasecmp(match->devname, "") == 0) { + if (verbose >= 0) + fprintf(stderr, Name ": array containing %s is explicitly" + " ignored by mdadm.conf\n", + devname); + return 1; + } + + if (!match && !conf_test_metadata(st->ss->name)) { + if (verbose >= 1) + fprintf(stderr, Name + ": %s has metadata type %s for which " + "auto-assembly is disabled\n", + devname, st->ss->name); + return 1; + } + /* 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) + else if ((homehost == NULL || + st->ss->match_home(st, homehost) != 1) && + st->ss->match_home(st, "any") != 1) trustworthy = FOREIGN; - name_to_use = strchr(info.name, ':'); - if (name_to_use) - name_to_use++; else - name_to_use = info.name; + trustworthy = LOCAL; /* There are three possible sources for 'autof': command line, * ARRAY line in mdadm.conf, or CREATE line in mdadm.conf. @@ -243,20 +260,32 @@ int Incremental(char *devname, int verbose, int runstop, return Incremental_container(st, devname, verbose, runstop, autof, trustworthy); } + + name_to_use = info.name; + if (name_to_use[0] == 0 && + info.array.level == LEVEL_CONTAINER && + trustworthy == LOCAL) { + name_to_use = info.text_version; + trustworthy = METADATA; + } + if (name_to_use[0] && trustworthy != LOCAL && + ! require_homehost && + conf_name_is_free(name_to_use)) + trustworthy = LOCAL; + + /* strip "hostname:" prefix from name if we have decided + * to treat it as LOCAL + */ + if (trustworthy == LOCAL && strchr(name_to_use, ':') != NULL) + name_to_use = strchr(name_to_use, ':')+1; + /* 4/ Check if array exists. */ map_lock(&map); mp = map_by_uuid(&map, info.uuid); - if (mp) { - mdfd = open_mddev(mp->path, 0); - if (mdfd < 0 && mddev_busy(mp->devnum)) { - /* maybe udev hasn't created it yet. */ - char buf[50]; - sprintf(buf, "%d:%d", dev2major(mp->devnum), - dev2minor(mp->devnum)); - mdfd = dev_open(buf, O_RDWR); - } - } else + if (mp) + mdfd = open_dev(mp->devnum); + else mdfd = -1; if (mdfd < 0) { @@ -265,8 +294,7 @@ int Incremental(char *devname, int verbose, int runstop, /* Couldn't find an existing array, maybe make a new one */ mdfd = create_mddev(match ? match->devname : NULL, - info.name, autof, trustworthy, chosen_name); - + name_to_use, autof, trustworthy, chosen_name); if (mdfd < 0) return 1; @@ -322,50 +350,55 @@ int Incremental(char *devname, int verbose, int runstop, struct supertype *st2; struct mdinfo info2, *d; - strcpy(chosen_name, mp->path); + if (mp->path) + strcpy(chosen_name, mp->path); + else + strcpy(chosen_name, devnum2devname(mp->devnum)); sra = sysfs_read(mdfd, fd2devnum(mdfd), (GET_DEVS | GET_STATE)); - sprintf(dn, "%d:%d", sra->devs->disk.major, - sra->devs->disk.minor); - dfd2 = dev_open(dn, O_RDONLY); - st2 = dup_super(st); - if (st2->ss->load_super(st2, dfd2, NULL) || - st->ss->compare_super(st, st2) != 0) { - fprintf(stderr, Name - ": metadata mismatch between %s and " - "chosen array %s\n", - devname, chosen_name); - close(mdfd); + if (sra->devs) { + sprintf(dn, "%d:%d", sra->devs->disk.major, + sra->devs->disk.minor); + dfd2 = dev_open(dn, O_RDONLY); + st2 = dup_super(st); + if (st2->ss->load_super(st2, dfd2, NULL) || + st->ss->compare_super(st, st2) != 0) { + fprintf(stderr, Name + ": metadata mismatch between %s and " + "chosen array %s\n", + devname, chosen_name); + close(mdfd); + close(dfd2); + return 2; + } close(dfd2); - 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 || - memcmp(info.uuid, info2.uuid, 16) != 0 || - info.array.raid_disks != info2.array.raid_disks) { - fprintf(stderr, Name - ": unexpected difference between %s and %s.\n", - chosen_name, devname); - close(mdfd); - return 2; + memset(&info2, 0, sizeof(info2)); + st2->ss->getinfo_super(st2, &info2); + st2->ss->free_super(st2); + if (info.array.level != info2.array.level || + memcmp(info.uuid, info2.uuid, 16) != 0 || + info.array.raid_disks != info2.array.raid_disks) { + fprintf(stderr, Name + ": unexpected difference between %s and %s.\n", + chosen_name, devname); + close(mdfd); + return 2; + } } 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); + err = add_disk(mdfd, st, 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 = add_disk(mdfd, st2, sra, &info2); + err = add_disk(mdfd, st, sra, &info2); } if (err < 0) { fprintf(stderr, Name ": failed to add %s to %s: %s.\n", @@ -383,22 +416,31 @@ int Incremental(char *devname, int verbose, int runstop, /* 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); - wait_for(chosen_name); - return Incremental(chosen_name, verbose, runstop, - NULL, homehost, autof); + wait_for(chosen_name, mdfd); + close(mdfd); + if (runstop < 0) + return 0; /* don't try to assemble */ + rv = Incremental(chosen_name, verbose, runstop, + NULL, homehost, require_homehost, autof); + if (rv == 1) + /* Don't fail the whole -I if a subarray didn't + * have enough devices to start yet + */ + rv = 0; + return rv; } avail = NULL; active_disks = count_active(st, mdfd, &avail, &info); if (enough(info.array.level, info.array.raid_disks, info.array.layout, info.array.state & 1, - avail, active_disks) == 0) { + avail, active_disks) == 0 || + (runstop < 0 && active_disks < info.array.raid_disks)) { free(avail); if (verbose >= 0) fprintf(stderr, Name @@ -462,7 +504,7 @@ int Incremental(char *devname, int verbose, int runstop, ": %s attached to %s, which has been started.\n", devname, chosen_name); rv = 0; - wait_for(chosen_name); + wait_for(chosen_name, mdfd); } else { fprintf(stderr, Name ": %s attached to %s, but failed to start: %s.\n", @@ -616,7 +658,7 @@ int IncrementalScan(int verbose) mdu_array_info_t array; mdu_bitmap_file_t bmf; struct mdinfo *sra; - int mdfd = open_mddev(me->path, 0); + int mdfd = open_dev(me->devnum); if (mdfd < 0) continue; @@ -627,8 +669,8 @@ int IncrementalScan(int verbose) } /* Ok, we can try this one. Maybe it needs a bitmap */ for (mddev = devs ; mddev ; mddev = mddev->next) - if (mddev->devname - && strcmp(mddev->devname, me->path) == 0) + if (mddev->devname && me->path + && devname_matches(mddev->devname, me->path)) break; if (mddev && mddev->bitmap_file) { /* @@ -662,11 +704,12 @@ int IncrementalScan(int verbose) if (verbose >= 0) fprintf(stderr, Name ": started array %s\n", - me->path); + me->path ?: devnum2devname(me->devnum)); } else { fprintf(stderr, Name ": failed to start array %s: %s\n", - me->path, strerror(errno)); + me->path ?: devnum2devname(me->devnum), + strerror(errno)); rv = 1; } } @@ -717,13 +760,18 @@ int Incremental_container(struct supertype *st, char *devname, int verbose, char chosen_name[1024]; struct map_ent *mp; struct mddev_ident_s *match = NULL; - int err; mp = map_by_uuid(&map, ra->uuid); - if (!mp) { + if (mp) { + mdfd = open_dev(mp->devnum); + if (mp->path) + strcpy(chosen_name, mp->path); + else + strcpy(chosen_name, devnum2devname(mp->devnum)); + } else { - /* Check in mdadm.conf for devices == devname and + /* Check in mdadm.conf for container == devname and * member == ra->text_version after second slash. */ char *sub = strchr(ra->text_version+1, '/'); @@ -760,13 +808,24 @@ int Incremental_container(struct supertype *st, char *devname, int verbose, array_list->member); break; } - } - mdfd = create_mddev(match ? match->devname : NULL, - ra->name, - autof, - trustworthy, - chosen_name); + if (match && match->devname && + strcasecmp(match->devname, "") == 0) { + if (verbose > 0) + fprintf(stderr, Name ": array %s/%s is " + "explicitly ignored by mdadm.conf\n", + match->container, match->member); + return 2; + } + if (match) + trustworthy = LOCAL; + + 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", @@ -774,10 +833,8 @@ int Incremental_container(struct supertype *st, char *devname, int verbose, return 2; } - err = assemble_container_content(st, mdfd, ra, runstop, - chosen_name, verbose); - if (err) - return err; + assemble_container_content(st, mdfd, ra, runstop, + chosen_name, verbose); } map_unlock(&map); return 0;