]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Create.c
Add subarray field to supertype.
[thirdparty/mdadm.git] / Create.c
index 2b59d037404e94e0b8a8695bbb40a1202dc9495c..495cf39a575c7c130287355efe7238fb6b6c11b6 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -71,9 +71,12 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        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;
+       int did_default = 0;
 
        int major_num = BITMAP_MAJOR_HI;
 
@@ -287,12 +290,9 @@ 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,
@@ -354,9 +354,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)) {
                                fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
                                return 1;
                        }
@@ -439,6 +442,8 @@ 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*/
@@ -481,7 +486,7 @@ 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;
+       info.array.major_version = 0; /* Flag to say "not zeroing superblock" */
 
        if (name == NULL || *name == 0) {
                /* base name on mddev */
@@ -510,6 +515,12 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid))
                return 1;
 
+       st->ss->getinfo_super(st, &info);
+
+       if (did_default)
+               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 +548,36 @@ 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)) {
+                               fprintf(stderr, Name ": mdmon already running "
+                                       "for %s - sorry\n",
+                                       devnum2devname(st->container_dev));
+                               return 1;
+                       }
+                       need_mdmon = 1;
                }
                if ((vers % 100) < 2 ||
                    sra == NULL ||
@@ -558,8 +591,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);
@@ -618,7 +651,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                            strcasecmp(dv->devname, "missing")==0)
                                continue;
 
-                       if (st->ss->external == 2)
+                       if (st->ss->external && st->subarray[0])
                                fd = open(dv->devname, O_RDWR, 0);
                        else
                                fd = open(dv->devname, O_RDWR|O_EXCL,0);
@@ -640,16 +673,15 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                                     fd, dv->devname);
                                break;
                        case 2:
+                               close(fd);
                                info.component_size = info.array.size * 2;
                                info.errors = 0;
                                rv = 0;
 
                                if (st->ss->external) {
                                        st->ss->getinfo_super_n(st, &info);
-                                       rv = sysfs_add_disk(sra, fd, &info);
-                                       close(fd);
+                                       rv = sysfs_add_disk(sra, &info);
                                } else {
-                                       close(fd);
                                        rv = ioctl(mdfd, ADD_NEW_DISK,
                                                 &info.disk);
                                }
@@ -682,6 +714,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 +732,31 @@ 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) {
+                               int dn = st->container_dev;
+                               int i;
+                               switch(fork()) {
+                               case 0:
+                                       /* FIXME yuk. CLOSE_EXEC?? */
+                                       for (i=3; i < 100; i++)
+                                               close(i);
+                                       execl("./mdmon", "mdmon",
+                                             map_dev(dev2major(dn),
+                                                     dev2minor(dn),
+                                                     1), NULL);
+                                       exit(1);
+                               case -1: fprintf(stderr, Name ": cannot fork. "
+                                                "Array remains readonly\n");
+                                       return 1;
+                               default: ; /* parent - good */
+                               }
+                       } else
+                               signal_mdmon(st->container_dev);
+                       /* FIXME wait for mdmon to set array to read-auto */
+                       sleep(1);
+                       close(container_fd);
+               }
        } else {
                fprintf(stderr, Name ": not starting array - not enough devices.\n");
        }