]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Create.c
Create: don't wait for device to appear if we didn't actually start the array
[thirdparty/mdadm.git] / Create.c
index b2edc7d6e7bcada0514854cc498fe105865f9ec9..783ab09f974bff2c5721bbdc29c227f0597a7b63 100644 (file)
--- a/Create.c
+++ b/Create.c
 #include       "md_p.h"
 #include       <ctype.h>
 
-int Create(struct supertype *st, char *mddev, int mdfd,
+int Create(struct supertype *st, char *mddev,
           int chunk, int level, int layout, unsigned long long size, int raiddisks, int sparedisks,
           char *name, char *homehost, int *uuid,
           int subdevs, mddev_dev_t devlist,
           int runstop, int verbose, int force, int assume_clean,
-          char *bitmap_file, int bitmap_chunk, int write_behind, int delay)
+          char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int autof)
 {
        /*
         * Create a new raid array.
@@ -55,6 +55,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
         * if runstop==run, or raiddisks disks were used,
         * RUN_ARRAY
         */
+       int mdfd;
        unsigned long long minsize=0, maxsize=0;
        char *mindisc = NULL;
        char *maxdisc = NULL;
@@ -72,31 +73,19 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        int rv;
        int bitmap_fd;
        int have_container = 0;
-       int container_fd;
+       int container_fd = -1;
        int need_mdmon = 0;
        unsigned long long bitmapsize;
-       struct mdinfo *sra;
        struct mdinfo info, *infos;
        int did_default = 0;
+       unsigned long safe_mode_delay = 0;
+       char chosen_name[1024];
+       struct map_ent *map = NULL;
 
        int major_num = BITMAP_MAJOR_HI;
 
        memset(&info, 0, sizeof(info));
 
-       vers = md_get_version(mdfd);
-       if (vers < 9000) {
-               fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
-               return 1;
-       } else {
-               mdu_array_info_t inf;
-               memset(&inf, 0, sizeof(inf));
-               ioctl(mdfd, GET_ARRAY_INFO, &inf);
-               if (inf.working_disks != 0) {
-                       fprintf(stderr, Name ": another array by this name"
-                               " is already running.\n");
-                       return 1;
-               }
-       }
        if (level == UnSet) {
                /* "ddf" and "imsm" metadata only supports one level - should possibly
                 * push this into metadata handler??
@@ -139,7 +128,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) {
@@ -166,6 +155,12 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                        devlist = NULL;
                }
        }
+       if (st && st->ss->external && sparedisks) {
+               fprintf(stderr,
+                       Name ": This metadata type does not support "
+                       "spare disks are create time\n");
+               return 1;
+       }
        if (subdevs > raiddisks+sparedisks) {
                fprintf(stderr, Name ": You have listed more devices (%d) than are in the array(%d)!\n", subdevs, raiddisks+sparedisks);
                return 1;
@@ -318,7 +313,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                }
 
                if (size && freesize < size) {
-                       fprintf(stderr, Name ": %s is smaller that given size."
+                       fprintf(stderr, Name ": %s is smaller than given size."
                                " %lluK < %lluK + metadata\n",
                                dname, freesize, size);
                        fail = 1;
@@ -333,7 +328,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));
@@ -394,7 +389,8 @@ int Create(struct supertype *st, char *mddev, int mdfd,
         * as missing, so that a reconstruct happens (faster than re-parity)
         * FIX: Can we do this for raid6 as well?
         */
-       if (assume_clean==0 && force == 0 && first_missing >= raiddisks) {
+       if (st->ss->external == 0 &&
+           assume_clean==0 && force == 0 && first_missing >= raiddisks) {
                switch ( level ) {
                case 4:
                case 5:
@@ -411,6 +407,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
         * into a spare, else the create will fail
         */
        if (assume_clean == 0 && force == 0 && first_missing < raiddisks &&
+           st->ss->external == 0 &&
            second_missing >= raiddisks && level == 6) {
                insert_point = raiddisks - 1;
                if (insert_point == first_missing)
@@ -426,6 +423,28 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                return 1;
        }
 
+       /* We need to create the device */
+       map_lock(&map);
+       mdfd = create_mddev(mddev, name, autof, LOCAL, chosen_name);
+       if (mdfd < 0)
+               return 1;
+       mddev = chosen_name;
+
+       vers = md_get_version(mdfd);
+       if (vers < 9000) {
+               fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
+               goto abort;
+       } else {
+               mdu_array_info_t inf;
+               memset(&inf, 0, sizeof(inf));
+               ioctl(mdfd, GET_ARRAY_INFO, &inf);
+               if (inf.working_disks != 0) {
+                       fprintf(stderr, Name ": another array by this name"
+                               " is already running.\n");
+                       goto abort;
+               }
+       }
+
        /* Ok, lets try some ioctls */
 
        info.array.level = level;
@@ -501,6 +520,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                 *  /dev/md/home -> home
                 *  /dev/mdhome -> home
                 */
+               /* FIXME compare this with rules in create_mddev */
                name = strrchr(mddev, '/');
                if (name) {
                        name++;
@@ -517,13 +537,14 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                }
        }
        if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid))
-               return 1;
+               goto abort;
 
        total_slots = info.array.nr_disks;
+       sysfs_init(&info, mdfd, 0);
        st->ss->getinfo_super(st, &info);
 
        if (did_default && verbose >= 0) {
-               if (info.text_version[0] == '/') {
+               if (is_subarray(info.text_version)) {
                        int dnum = devname2devnum(info.text_version+1);
                        char *path;
                        int mdp = get_mdp_major();
@@ -544,6 +565,10 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                " %s metadata\n", info.text_version);
        }
 
+       map_update(&map, fd2devnum(mdfd), info.text_version,
+                  info.uuid, chosen_name);
+       map_unlock(&map);
+
        if (bitmap_file && vers < 9003) {
                major_num = BITMAP_MAJOR_HOSTENDIAN;
 #ifdef __BIG_ENDIAN
@@ -555,75 +580,55 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        if (bitmap_file && strcmp(bitmap_file, "internal")==0) {
                if ((vers%100) < 2) {
                        fprintf(stderr, Name ": internal bitmaps not supported by this kernel.\n");
-                       return 1;
+                       goto abort;
                }
                if (!st->ss->add_internal_bitmap(st, &bitmap_chunk,
                                                 delay, write_behind,
                                                 bitmapsize, 1, major_num)) {
                        fprintf(stderr, Name ": Given bitmap chunk size not supported.\n");
-                       return 1;
+                       goto abort;
                }
                bitmap_file = NULL;
        }
 
 
-       sra = sysfs_read(mdfd, 0, 0);
+       sysfs_init(&info, mdfd, 0);
 
-       if (st->ss->external) {
-               char ver[100];
-               strcat(strcpy(ver, "external:"),
-                      info.text_version);
-               if (st->ss->external && st->subarray[0]) {
-                       /* 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 ||
-                   sysfs_set_str(sra, NULL, "metadata_version",
-                                 ver) < 0) {
-                       fprintf(stderr, Name ": This kernel does not "
-                               "support external metadata.\n");
-                       return 1;
+       if (st->ss->external && st->subarray[0]) {
+               /* 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");
+                       goto abort;
                }
-               rv = sysfs_set_array(sra, &info);
-       } else  if ((vers % 100) >= 1) { /* can use different versions */
-               mdu_array_info_t inf;
-               memset(&inf, 0, sizeof(inf));
-               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);
+               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;
+       }
+       rv = set_array_info(mdfd, st, &info);
        if (rv) {
-               fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
+               fprintf(stderr, Name ": failed to set array info for %s: %s\n",
                        mddev, strerror(errno));
-               return 1;
+               goto abort;
        }
 
        if (bitmap_file) {
@@ -634,18 +639,18 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                 delay, write_behind,
                                 bitmapsize,
                                 major_num)) {
-                       return 1;
+                       goto abort;
                }
                bitmap_fd = open(bitmap_file, O_RDWR);
                if (bitmap_fd < 0) {
                        fprintf(stderr, Name ": weird: %s cannot be openned\n",
                                bitmap_file);
-                       return 1;
+                       goto abort;
                }
                if (ioctl(mdfd, SET_BITMAP_FILE, bitmap_fd) < 0) {
                        fprintf(stderr, Name ": Cannot set bitmap file for %s: %s\n",
                                mddev, strerror(errno));
-                       return 1;
+                       goto abort;
                }
        }
 
@@ -681,19 +686,19 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                else
                                        inf->disk.state = 0;
 
-                               if (dv->writemostly)
+                               if (dv->writemostly == 1)
                                        inf->disk.state |= (1<<MD_DISK_WRITEMOSTLY);
 
                                if (st->ss->external && st->subarray[0])
-                                       fd = open(dv->devname, O_RDWR, 0);
+                                       fd = open(dv->devname, O_RDWR);
                                else
-                                       fd = open(dv->devname, O_RDWR|O_EXCL,0);
+                                       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;
+                                       goto abort;
                                }
                                fstat(fd, &stb);
                                inf->disk.major = major(stb.st_rdev);
@@ -703,6 +708,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                st->ss->add_to_super(st, &inf->disk,
                                                     fd, dv->devname);
                                st->ss->getinfo_super(st, inf);
+                               safe_mode_delay = inf->safe_mode_delay;
 
                                /* getinfo_super might have lost these ... */
                                inf->disk.major = major(stb.st_rdev);
@@ -712,11 +718,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                inf->errors = 0;
                                rv = 0;
 
-                               if (st->ss->external)
-                                       rv = sysfs_add_disk(sra, inf);
-                               else
-                                       rv = ioctl(mdfd, ADD_NEW_DISK,
-                                                  &inf->disk);
+                               rv = add_disk(mdfd, st, &info, inf);
 
                                if (rv) {
                                        fprintf(stderr,
@@ -724,7 +726,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                                "failed: %s\n",
                                                dv->devname, strerror(errno));
                                        st->ss->free_super(st);
-                                       return 1;
+                                       goto abort;
                                }
                                break;
                        }
@@ -738,63 +740,55 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        free(infos);
        st->ss->free_super(st);
 
-       /* param is not actually used */
-       if (level == LEVEL_CONTAINER)
-               /* No need to start */
+       if (level == LEVEL_CONTAINER) {
+               /* No need to start.  But we should signal udev to
+                * create links */
+               sysfs_uevent(&info, "change");
                ;
-       else if (runstop == 1 || subdevs >= raiddisks) {
+       else if (runstop == 1 || subdevs >= raiddisks) {
                if (st->ss->external) {
                        switch(level) {
                        case LEVEL_LINEAR:
                        case LEVEL_MULTIPATH:
                        case 0:
-                               sysfs_set_str(sra, NULL, "array_state",
+                               sysfs_set_str(&info, NULL, "array_state",
                                              "active");
                                need_mdmon = 0;
                                break;
                        default:
-                               sysfs_set_str(sra, NULL, "array_state",
+                               sysfs_set_str(&info, NULL, "array_state",
                                              "readonly");
                                break;
                        }
+                       sysfs_set_safemode(&info, safe_mode_delay);
                } else {
+                       /* param is not actually used */
                        mdu_param_t param;
                        if (ioctl(mdfd, RUN_ARRAY, &param)) {
                                fprintf(stderr, Name ": RUN_ARRAY failed: %s\n",
                                        strerror(errno));
                                Manage_runstop(mddev, mdfd, -1, 0);
-                               return 1;
+                               goto abort;
                        }
                }
                if (verbose >= 0)
                        fprintf(stderr, Name ": array %s started.\n", mddev);
                if (st->ss->external && st->subarray[0]) {
-                       if (need_mdmon && !env_no_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);
+                       if (need_mdmon)
+                               start_mdmon(st->container_dev);
+
+                       ping_monitor(devnum2devname(st->container_dev));
                        close(container_fd);
                }
+               wait_for(chosen_name);
        } else {
                fprintf(stderr, Name ": not starting array - not enough devices.\n");
        }
+       close(mdfd);
        return 0;
+
+ abort:
+       if (mdfd >= 0)
+               close(mdfd);
+       return 1;
 }