array_try_spare(): missing map_unlock()

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 0ffbbc9a22acf265fa56f5eee9dca191c0127490..2000dd073c3a560b74b349b50013ee4536581da6 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -138,7 +138,7 @@ int Assemble(struct supertype *st, char *mddev,
             char *backup_file, int invalid_backup,
             int readonly, int runstop,
             char *update, char *homehost, int require_homehost,
-            int verbose, int force)
+            int verbose, int force, int freeze_reshape)
 {
        /*
         * The task of Assemble is to find a collection of
@@ -418,7 +418,6 @@ int Assemble(struct supertype *st, char *mddev,
                                        int uuid[4];
 
                                        content = &info;
-                                       memset(content, 0, sizeof(*content));
                                        tst->ss->getinfo_super(tst, content, NULL);
 
                                        if (!parse_uuid(ident->container, uuid) ||
@@ -484,7 +483,6 @@ int Assemble(struct supertype *st, char *mddev,
                } else {
 
                        content = &info;
-                       memset(content, 0, sizeof(*content));
                        tst->ss->getinfo_super(tst, content, NULL);
 
                        if (!ident_matches(ident, content, tst,
@@ -699,7 +697,7 @@ int Assemble(struct supertype *st, char *mddev,
                int err;
                err = assemble_container_content(st, mdfd, content, runstop,
                                                 chosen_name, verbose,
-                                                backup_file);
+                                                backup_file, freeze_reshape);
                close(mdfd);
                return err;
        }
@@ -1062,6 +1060,8 @@ int Assemble(struct supertype *st, char *mddev,
                        continue;
                if (!devices[j].uptodate)
                        continue;
+               if (devices[j].i.events < devices[most_recent].i.events)
+                       continue;
                chosen_drive = j;
                if ((fd=dev_open(devices[j].devname, O_RDONLY|O_EXCL))< 0) {
                        fprintf(stderr, Name ": Cannot open %s: %s\n",
@@ -1158,6 +1158,9 @@ int Assemble(struct supertype *st, char *mddev,
                        free(devices);
                        return 1;
                }
+               if (verbose >= 0)
+                       fprintf(stderr, Name ": Marking array %s as 'clean'\n",
+                               mddev);
                close(fd);
        }
 
@@ -1187,8 +1190,11 @@ int Assemble(struct supertype *st, char *mddev,
                                fdlist[i] = -1;
                }
                if (!err) {
-                       err = Grow_restart(st, content, fdlist, bestcnt,
-                                          backup_file, verbose > 0);
+                       if (st->ss->external && st->ss->recover_backup)
+                               err = st->ss->recover_backup(st, content);
+                       else
+                               err = Grow_restart(st, content, fdlist, bestcnt,
+                                                  backup_file, verbose > 0);
                        if (err && invalid_backup) {
                                if (verbose > 0)
                                        fprintf(stderr, Name ": continuing"
@@ -1337,9 +1343,14 @@ int Assemble(struct supertype *st, char *mddev,
                        int rv;
 #ifndef MDASSEMBLE
                        if (content->reshape_active &&
-                           content->delta_disks <= 0)
-                               rv = Grow_continue(mdfd, st, content, backup_file);
-                       else
+                           content->delta_disks <= 0) {
+                               rv = sysfs_set_str(content, NULL,
+                                                  "array_state", "readonly");
+                               if (rv == 0)
+                                       rv = Grow_continue(mdfd, st, content,
+                                                          backup_file,
+                                                          freeze_reshape);
+                       } else
 #endif
                                rv = ioctl(mdfd, RUN_ARRAY, NULL);
                        if (rv == 0) {
@@ -1377,7 +1388,7 @@ int Assemble(struct supertype *st, char *mddev,
                                         * might allow them to be included, or
                                         * they will become spares.
                                         */
-                                       for (i = 0; i <= bestcnt; i++) {
+                                       for (i = 0; i < bestcnt; i++) {
                                                int j = best[i];
                                                if (j >= 0 && !devices[j].uptodate) {
                                                        if (!disk_action_allows(&devices[j].i, st->ss->name, act_re_add))
@@ -1505,12 +1516,13 @@ int Assemble(struct supertype *st, char *mddev,
 int assemble_container_content(struct supertype *st, int mdfd,
                               struct mdinfo *content, int runstop,
                               char *chosen_name, int verbose,
-                              char *backup_file)
+                              char *backup_file, int freeze_reshape)
 {
        struct mdinfo *dev, *sra;
        int working = 0, preexist = 0;
        int expansion = 0;
        struct map_ent *map = NULL;
+       int old_raid_disks;
 
        sysfs_init(content, mdfd, 0);
 
@@ -1519,15 +1531,15 @@ int assemble_container_content(struct supertype *st, int mdfd,
                if (sysfs_set_array(content, md_get_version(mdfd)) != 0)
                        return 1;
 
-       if (content->reshape_active)
+       if (st->ss->external && content->recovery_blocked)
                block_subarray(content);
 
        if (sra)
                sysfs_free(sra);
-
+       old_raid_disks = content->array.raid_disks - content->delta_disks;
        for (dev = content->devs; dev; dev = dev->next)
                if (sysfs_add_disk(content, dev, 1) == 0) {
-                       if (dev->disk.raid_disk >= content->array.raid_disks &&
+                       if (dev->disk.raid_disk >= old_raid_disks &&
                            content->reshape_active)
                                expansion++;
                        else
@@ -1548,37 +1560,24 @@ int assemble_container_content(struct supertype *st, int mdfd,
 
                if (content->reshape_active) {
                        int spare = content->array.raid_disks + expansion;
-                       int i;
-                       int *fdlist = malloc(sizeof(int) *
-                                            (working + expansion
-                                             + content->array.raid_disks));
-                       for (i=0; i<spare; i++)
-                               fdlist[i] = -1;
-                       for (dev = content->devs; dev; dev = dev->next) {
-                               int fd = open_dev(makedev(dev->disk.major,
-                                                         dev->disk.minor));
-                               if (dev->disk.raid_disk >= 0)
-                                       fdlist[dev->disk.raid_disk] = fd;
-                               else
-                                       fdlist[spare++] = fd;
-                       }
-                       err = Grow_restart(st, content, fdlist, spare,
-                                          backup_file, verbose > 0);
-                       while (spare > 0) {
-                               spare--;
-                               if (fdlist[spare] >= 0)
-                                       close(fdlist[spare]);
-                       }
-                       if (err) {
-                               fprintf(stderr, Name ": Failed to restore critical"
-                                       " section for reshape - sorry.\n");
-                               if (!backup_file)
-                                       fprintf(stderr, Name ":  Possibly you need"
-                                               " to specify a --backup-file\n");
+                       if (restore_backup(st, content,
+                                          working,
+                                          spare, backup_file, verbose) == 1)
+                               return 1;
+
+                       err = sysfs_set_str(content, NULL,
+                                           "array_state", "readonly");
+                       if (err)
                                return 1;
+
+                       if (st->ss->external) {
+                               if (!mdmon_running(st->container_dev))
+                                       start_mdmon(st->container_dev);
+                               ping_monitor_by_id(st->container_dev);
                        }
 
-                       err = Grow_continue(mdfd, st, content, backup_file);
+                       err = Grow_continue(mdfd, st, content, backup_file,
+                                           freeze_reshape);
                } else switch(content->array.level) {
                case LEVEL_LINEAR:
                case LEVEL_MULTIPATH:
@@ -1593,7 +1592,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
                        if (!err) {
                                if (!mdmon_running(st->container_dev))
                                        start_mdmon(st->container_dev);
-                               ping_monitor(devnum2devname(st->container_dev));
+                               ping_monitor_by_id(st->container_dev);
                        }
                        break;
                }