X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Create.c;h=9058af1837bef34de8dc0ec776174bfb8c6c689f;hp=2b59d037404e94e0b8a8695bbb40a1202dc9495c;hb=3c558363a1991430e8a9e10c93ee9ee3f8996940;hpb=3cfe6247400e92f85282da89dfea7f1d3ba88634 diff --git a/Create.c b/Create.c index 2b59d037..9058af18 100644 --- a/Create.c +++ b/Create.c @@ -66,14 +66,18 @@ int Create(struct supertype *st, char *mddev, int mdfd, int second_missing = subdevs * 2; int missing_disks = 0; int insert_point = subdevs * 2; /* where to insert a missing drive */ + int total_slots; int pass; int vers; int rv; int bitmap_fd; int have_container = 0; + int container_fd; + int need_mdmon = 0; unsigned long long bitmapsize; struct mdinfo *sra; - struct mdinfo info; + struct mdinfo info, *infos; + int did_default = 0; int major_num = BITMAP_MAJOR_HI; @@ -135,7 +139,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, int fd; memset(&inf, 0, sizeof(inf)); - fd = open(devlist->devname, O_RDONLY, 0); + fd = open(devlist->devname, O_RDONLY); if (fd >= 0 && ioctl(fd, GET_ARRAY_INFO, &inf) == 0 && inf.raid_disks == 0) { @@ -241,7 +245,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (st && ! st->ss->validate_geometry(st, level, layout, raiddisks, - chunk, size, NULL, NULL)) + chunk, size, NULL, NULL, verbose>=0)) return 1; /* now look at the subdevs */ @@ -277,7 +281,8 @@ int Create(struct supertype *st, char *mddev, int mdfd, st = superlist[i]->match_metadata_desc(name); if (st && !st->ss->validate_geometry (st, level, layout, raiddisks, - chunk, size, dname, &freesize)) + chunk, size, dname, &freesize, + verbose > 0)) st = NULL; } @@ -287,17 +292,15 @@ int Create(struct supertype *st, char *mddev, int mdfd, dname); exit(2); } - if (st->ss->major != 0 || + if (st->ss != &super0 || st->minor_version != 90) - fprintf(stderr, Name ": Defaulting to version" - " %d.%d metadata\n", - st->ss->major, - st->minor_version); + did_default = 1; } else { if (!st->ss->validate_geometry(st, level, layout, raiddisks, chunk, size, dname, - &freesize)) { + &freesize, + verbose > 0)) { fprintf(stderr, Name ": %s is not suitable for " @@ -330,7 +333,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, minsize = freesize; } if (runstop != 1 || verbose >= 0) { - int fd = open(dname, O_RDONLY, 0); + int fd = open(dname, O_RDONLY); if (fd <0 ) { fprintf(stderr, Name ": Cannot open %s: %s\n", dname, strerror(errno)); @@ -354,9 +357,12 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (level > 0 || level == LEVEL_MULTIPATH || level == LEVEL_FAULTY - || (st && st->ss->external) ) { + || st->ss->external ) { /* size is meaningful */ - if (minsize > 0x100000000ULL && st->ss->major == 0) { + if (!st->ss->validate_geometry(st, level, layout, + raiddisks, + chunk, minsize, + NULL, NULL, 0)) { fprintf(stderr, Name ": devices too large for RAID level %d\n", level); return 1; } @@ -439,12 +445,16 @@ int Create(struct supertype *st, char *mddev, int mdfd, ( level == 6 && (insert_point < raiddisks || second_missing < raiddisks)) || + ( level <= 0 ) + || assume_clean - ) + ) { info.array.state = 1; /* clean, but one+ drive will be missing*/ - else + info.resync_start = ~0ULL; + } else { info.array.state = 0; /* not clean, but no errors */ - + info.resync_start = 0; + } if (level == 10) { /* for raid10, the bitmap size is the capacity of the array, * which is array.size * raid_disks / ncopies; @@ -481,7 +491,6 @@ int Create(struct supertype *st, char *mddev, int mdfd, + info.array.failed_disks; info.array.layout = layout; info.array.chunk_size = chunk*1024; - info.array.major_version = st->ss->major; if (name == NULL || *name == 0) { /* base name on mddev */ @@ -510,6 +519,31 @@ int Create(struct supertype *st, char *mddev, int mdfd, if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid)) return 1; + total_slots = info.array.nr_disks; + st->ss->getinfo_super(st, &info); + + if (did_default && verbose >= 0) { + if (is_subarray(info.text_version)) { + int dnum = devname2devnum(info.text_version+1); + char *path; + int mdp = get_mdp_major(); + struct mdinfo *mdi; + if (dnum > 0) + path = map_dev(MD_MAJOR, dnum, 1); + else + path = map_dev(mdp, (-1-dnum)<< 6, 1); + + mdi = sysfs_read(-1, dnum, GET_VERSION); + + fprintf(stderr, Name ": Creating array inside " + "%s container %s\n", + mdi?mdi->text_version:"managed", path); + sysfs_free(mdi); + } else + fprintf(stderr, Name ": Defaulting to version" + " %s metadata\n", info.text_version); + } + if (bitmap_file && vers < 9003) { major_num = BITMAP_MAJOR_HOSTENDIAN; #ifdef __BIG_ENDIAN @@ -537,14 +571,37 @@ int Create(struct supertype *st, char *mddev, int mdfd, if (st->ss->external) { char ver[100]; - if (st->ss->external == 1) - /* container */ - strcat(strcpy(ver, "external:"), st->ss->text_version); - else { + strcat(strcpy(ver, "external:"), + info.text_version); + if (st->ss->external && st->subarray[0]) { /* member */ - sprintf(ver, "external:/%s/%d", - devnum2devname(st->container_dev), - st->container_member); + + /* When creating a member, we need to be careful + * to negotiate with mdmon properly. + * If it is already running, we cannot write to + * the devices and must ask it to do that part. + * If it isn't running, we write to the devices, + * and then start it. + * We hold an exclusive open on the container + * device to make sure mdmon doesn't exit after + * we checked that it is running. + * + * For now, fail if it is already running. + */ + container_fd = open_dev_excl(st->container_dev); + if (container_fd < 0) { + fprintf(stderr, Name ": Cannot get exclusive " + "open on container - weird.\n"); + return 1; + } + if (mdmon_running(st->container_dev)) { + if (verbose) + fprintf(stderr, Name ": reusing mdmon " + "for %s.\n", + devnum2devname(st->container_dev)); + st->update_tail = &st->updates; + } else + need_mdmon = 1; } if ((vers % 100) < 2 || sra == NULL || @@ -558,8 +615,8 @@ int Create(struct supertype *st, char *mddev, int mdfd, } else if ((vers % 100) >= 1) { /* can use different versions */ mdu_array_info_t inf; memset(&inf, 0, sizeof(inf)); - inf.major_version = st->ss->major; - inf.minor_version = st->minor_version; + inf.major_version = info.array.major_version; + inf.minor_version = info.array.minor_version; rv = ioctl(mdfd, SET_ARRAY_INFO, &inf); } else rv = ioctl(mdfd, SET_ARRAY_INFO, NULL); @@ -592,6 +649,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, } } + infos = malloc(sizeof(*infos) * total_slots); for (pass=1; pass <=2 ; pass++) { mddev_dev_t moved_disk = NULL; /* the disk that was moved out of the insert point */ @@ -600,59 +658,66 @@ int Create(struct supertype *st, char *mddev, int mdfd, dv=(dv->next)?(dv->next):moved_disk, dnum++) { int fd; struct stat stb; + struct mdinfo *inf = &infos[dnum]; - info.disk.number = dnum; + if (dnum >= total_slots) + abort(); if (dnum == insert_point) { moved_disk = dv; } - info.disk.raid_disk = info.disk.number; - if (info.disk.raid_disk < raiddisks) - info.disk.state = (1<writemostly) - info.disk.state |= (1<devname, "missing")==0) continue; - if (st->ss->external == 2) - fd = open(dv->devname, O_RDWR, 0); - else - fd = open(dv->devname, O_RDWR|O_EXCL,0); + switch(pass) { + case 1: + *inf = info; - if (fd < 0) { - fprintf(stderr, Name ": failed to open %s " - "after earlier success - aborting\n", - dv->devname); - return 1; - } - fstat(fd, &stb); - info.disk.major = major(stb.st_rdev); - info.disk.minor = minor(stb.st_rdev); + inf->disk.number = dnum; + inf->disk.raid_disk = dnum; + if (inf->disk.raid_disk < raiddisks) + inf->disk.state = (1<disk.state = 0; + + if (dv->writemostly) + inf->disk.state |= (1<ss->external && st->subarray[0]) + fd = open(dv->devname, O_RDWR); + else + fd = open(dv->devname, O_RDWR|O_EXCL); + + if (fd < 0) { + fprintf(stderr, Name ": failed to open %s " + "after earlier success - aborting\n", + dv->devname); + return 1; + } + fstat(fd, &stb); + inf->disk.major = major(stb.st_rdev); + inf->disk.minor = minor(stb.st_rdev); - switch(pass){ - case 1: remove_partitions(fd); - st->ss->add_to_super(st, &info.disk, + st->ss->add_to_super(st, &inf->disk, fd, dv->devname); + st->ss->getinfo_super(st, inf); + + /* getinfo_super might have lost these ... */ + inf->disk.major = major(stb.st_rdev); + inf->disk.minor = minor(stb.st_rdev); break; case 2: - info.component_size = info.array.size * 2; - info.errors = 0; + inf->errors = 0; rv = 0; - if (st->ss->external) { - st->ss->getinfo_super_n(st, &info); - rv = sysfs_add_disk(sra, fd, &info); - close(fd); - } else { - close(fd); + if (st->ss->external) + rv = sysfs_add_disk(sra, inf); + else rv = ioctl(mdfd, ADD_NEW_DISK, - &info.disk); - } + &inf->disk); + if (rv) { fprintf(stderr, Name ": ADD_NEW_DISK for %s " @@ -665,9 +730,12 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (dv == moved_disk && dnum != insert_point) break; } - if (pass == 1) + if (pass == 1) { st->ss->write_init_super(st); + flush_metadata_updates(st); + } } + free(infos); st->ss->free_super(st); /* param is not actually used */ @@ -682,6 +750,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, case 0: sysfs_set_str(sra, NULL, "array_state", "active"); + need_mdmon = 0; break; default: sysfs_set_str(sra, NULL, "array_state", @@ -699,6 +768,13 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (verbose >= 0) fprintf(stderr, Name ": array %s started.\n", mddev); + if (st->ss->external && st->subarray[0]) { + if (need_mdmon) + start_mdmon(st->container_dev); + + ping_monitor(devnum2devname(st->container_dev)); + close(container_fd); + } } else { fprintf(stderr, Name ": not starting array - not enough devices.\n"); }