wait_for improvement.

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index c86a165ee139b6a560e02c1a23b92c99554ed761..172bc53e80e0393ebedbadfcf0ad4b583c709618 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -168,7 +168,6 @@ int Assemble(struct supertype *st, char *mddev,
        mddev_dev_t tmpdev;
        struct mdinfo info;
        struct mdinfo *content = NULL;
-       mdu_array_info_t tmp_inf;
        char *avail;
        int nextspare = 0;
        char *name = NULL;
@@ -320,7 +319,7 @@ int Assemble(struct supertype *st, char *mddev,
 
                        tmpdev->content = content->next;
                        if (tmpdev->content == NULL)
-                               tmpdev->used = 1;
+                               tmpdev->used = 2;
 
                } else if (ident->container || ident->member) {
                        /* No chance of this matching if we don't have
@@ -396,12 +395,15 @@ int Assemble(struct supertype *st, char *mddev,
                         * looking.  If the chosen member is active, skip.
                         */
                        if (is_member_busy(content->text_version)) {
+                               if (report_missmatch)
+                                       fprintf(stderr, Name ": member %s in %s is already assembled\n",
+                                               content->text_version,
+                                               devname);
+                               tst->ss->free_super(tst);
+                               tst = NULL;
+                               content = NULL;
                                if (auto_assem)
                                        goto loop;
-                               fprintf(stderr, Name ": member %s in %s is already assembled\n",
-                                       content->text_version,
-                                       devname);
-                               tst->ss->free_super(tst);
                                return 1;
                        }
                        st = tst; tst = NULL;
@@ -522,7 +524,7 @@ int Assemble(struct supertype *st, char *mddev,
                close(mdfd);
                return 1;
        }
-       if (ioctl(mdfd, GET_ARRAY_INFO, &tmp_inf)==0) {
+       if (mddev_busy(fd2devnum(mdfd))) {
                fprintf(stderr, Name ": %s already active, cannot restart it!\n",
                        mddev);
                for (tmpdev = devlist ;
@@ -767,7 +769,6 @@ int Assemble(struct supertype *st, char *mddev,
                        int j = best[i];
                        if (j>=0 &&
                            !devices[j].uptodate &&
-                           devices[j].i.events > 0 &&
                            (chosen_drive < 0 ||
                             devices[j].i.events
                             > devices[chosen_drive].i.events))
@@ -825,7 +826,6 @@ int Assemble(struct supertype *st, char *mddev,
                        int j = best[i];
                        if (j >= 0 &&
                            !devices[j].uptodate &&
-                           devices[j].i.events > 0 &&
                            devices[j].i.events == current_events) {
                                chosen_drive = j;
                                goto add_another;
@@ -889,6 +889,8 @@ int Assemble(struct supertype *st, char *mddev,
                        continue;
 
                devices[j].i.disk.state = desired_state;
+               if (!(devices[j].i.array.state & 1))
+                       clean = 0;
 
                if (st->ss->update_super(st, &devices[j].i, "assemble", NULL,
                                         verbose, 0, NULL)) {
@@ -1067,6 +1069,7 @@ int Assemble(struct supertype *st, char *mddev,
                                fprintf(stderr, "\n");
                        }
                        sysfs_uevent(content, "change");
+                       wait_for(chosen_name, mdfd);
                        close(mdfd);
                        return 0;
                }
@@ -1087,6 +1090,21 @@ int Assemble(struct supertype *st, char *mddev,
                                                fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
                                        fprintf(stderr, ".\n");
                                }
+                               if (content->reshape_active &&
+                                   content->array.level >= 4 &&
+                                   content->array.level <= 6) {
+                                       /* might need to increase the size
+                                        * of the stripe cache - default is 256
+                                        */
+                                       if (256 < 4 * (content->array.chunk_size/4096)) {
+                                               struct mdinfo *sra = sysfs_read(mdfd, 0, 0);
+                                               if (sra)
+                                                       sysfs_set_num(sra, NULL,
+                                                                     "stripe_cache_size",
+                                                                     (4 * content->array.chunk_size / 4096) + 1);
+                                       }
+                               }
+                               wait_for(mddev, mdfd);
                                close(mdfd);
                                if (auto_assem) {
                                        int usecs = 1;
@@ -1202,8 +1220,10 @@ int assemble_container_content(struct supertype *st, int mdfd,
 
        sra = sysfs_read(mdfd, 0, GET_VERSION);
        if (sra == NULL || strcmp(sra->text_version, content->text_version) != 0)
-               if (sysfs_set_array(content, md_get_version(mdfd)) != 0)
+               if (sysfs_set_array(content, md_get_version(mdfd)) != 0) {
+                       close(mdfd);
                        return 1;
+               }
        if (sra)
                sysfs_free(sra);
 
@@ -1212,10 +1232,12 @@ int assemble_container_content(struct supertype *st, int mdfd,
                        working++;
                else if (errno == EEXIST)
                        preexist++;
-       if (working == 0)
-               /* Nothing new, don't try to start */ ;
-       else if (runstop > 0 ||
+       if (working == 0) {
+               close(mdfd);
+               return 1;/* Nothing new, don't try to start */
+       } else if (runstop > 0 ||
                 (working + preexist) >= content->array.working_disks) {
+               int err;
 
                map_update(&map, fd2devnum(mdfd),
                           content->text_version,
@@ -1224,37 +1246,49 @@ int assemble_container_content(struct supertype *st, int mdfd,
                case LEVEL_LINEAR:
                case LEVEL_MULTIPATH:
                case 0:
-                       sysfs_set_str(content, NULL, "array_state",
-                                     "active");
+                       err = sysfs_set_str(content, NULL, "array_state",
+                                           "active");
                        break;
                default:
-                       sysfs_set_str(content, NULL, "array_state",
+                       err = sysfs_set_str(content, NULL, "array_state",
                                      "readonly");
                        /* start mdmon if needed. */
-                       if (!mdmon_running(st->container_dev))
-                               start_mdmon(st->container_dev);
-                       ping_monitor(devnum2devname(st->container_dev));
+                       if (!err) {
+                               if (!mdmon_running(st->container_dev))
+                                       start_mdmon(st->container_dev);
+                               ping_monitor(devnum2devname(st->container_dev));
+                       }
                        break;
                }
-               sysfs_set_safemode(content, content->safe_mode_delay);
+               if (!err)
+                       sysfs_set_safemode(content, content->safe_mode_delay);
                if (verbose >= 0) {
-                       fprintf(stderr, Name
-                               ": Started %s with %d devices",
-                               chosen_name, working + preexist);
+                       if (err)
+                               fprintf(stderr, Name
+                                       ": array %s now has %d devices",
+                                       chosen_name, working + preexist);
+                       else
+                               fprintf(stderr, Name
+                                       ": Started %s with %d devices",
+                                       chosen_name, working + preexist);
                        if (preexist)
                                fprintf(stderr, " (%d new)", working);
                        fprintf(stderr, "\n");
                }
-               wait_for(chosen_name);
+               if (!err)
+                       wait_for(chosen_name, mdfd);
+               close(mdfd);
+               return 0;
                /* FIXME should have an O_EXCL and wait for read-auto */
-       } else
+       } else {
                if (verbose >= 0)
                        fprintf(stderr, Name
                                ": %s assembled with %d devices but "
                                "not started\n",
                                chosen_name, working);
-
-       return 0;
+               close(mdfd);
+               return 1;
+       }
 }
 #endif