]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Assemble.c
Monitor: don't use default modes when creating a file
[thirdparty/mdadm.git] / Assemble.c
index 9f33c6148b55a99049d642ee13d760808d900a62..ed0ddfb1d3d5f8e56efa0d8ecac3c8aa4fe46221 100644 (file)
@@ -269,7 +269,7 @@ static int select_devices(struct mddev_dev *devlist,
                        if (auto_assem || !inargv)
                                /* Ignore unrecognised devices during auto-assembly */
                                goto loop;
-                       if (ident->uuid_set || ident->name[0] ||
+                       if (ident->name[0] ||
                            ident->super_minor != UnSet)
                                /* Ignore unrecognised device if looking for
                                 * specific array */
@@ -281,6 +281,8 @@ static int select_devices(struct mddev_dev *devlist,
                                st->ss->free_super(st);
                        dev_policy_free(pol);
                        domain_free(domains);
+                       if (tst)
+                               tst->ss->free_super(tst);
                        return -1;
                }
 
@@ -576,6 +578,7 @@ static int load_devices(struct devs *devices, char *devmap,
                struct supertype *tst;
                int i;
                int dfd;
+               int disk_state;
 
                if (tmpdev->used != 1)
                        continue;
@@ -592,6 +595,9 @@ static int load_devices(struct devs *devices, char *devmap,
                        if (strcmp(c->update, "ppl") == 0 &&
                            ident->bitmap_fd >= 0) {
                                pr_err("PPL is not compatible with bitmap\n");
+                               close(mdfd);
+                               free(devices);
+                               free(devmap);
                                return -1;
                        }
 
@@ -706,7 +712,9 @@ static int load_devices(struct devs *devices, char *devmap,
                devices[devcnt].i.disk.major = major(stb.st_rdev);
                devices[devcnt].i.disk.minor = minor(stb.st_rdev);
 
-               if (devices[devcnt].i.disk.state == 6) {
+               disk_state = devices[devcnt].i.disk.state & ~((1<<MD_DISK_FAILFAST) |
+                                                             (1<<MD_DISK_WRITEMOSTLY));
+               if (disk_state == ((1<<MD_DISK_ACTIVE) | (1<<MD_DISK_SYNC))) {
                        if (most_recent < 0 ||
                            devices[devcnt].i.events
                            > devices[most_recent].i.events) {
@@ -779,6 +787,8 @@ static int load_devices(struct devs *devices, char *devmap,
                        if (best[i] == -1 || (devices[best[i]].i.events
                                              < devices[devcnt].i.events))
                                best[i] = devcnt;
+                       else if (st->ss == &super_imsm)
+                               best[i+1] = devcnt;
                }
                devcnt++;
        }
@@ -869,7 +879,7 @@ static int force_array(struct mdinfo *content,
                current_events = devices[chosen_drive].i.events;
        add_another:
                if (c->verbose >= 0)
-                       pr_err("forcing event count in %s(%d) from %d upto %d\n",
+                       pr_err("forcing event count in %s(%d) from %d up to %d\n",
                               devices[chosen_drive].devname,
                               devices[chosen_drive].i.disk.raid_disk,
                               (int)(devices[chosen_drive].i.events),
@@ -1021,6 +1031,11 @@ static int start_array(int mdfd,
                                pr_err("failed to add %s to %s: %s\n",
                                       devices[j].devname, mddev,
                                       strerror(errno));
+                               if (errno == EINVAL && content->array.level == 0 &&
+                                   content->array.layout != 0) {
+                                       cont_err("Possibly your kernel doesn't support RAID0 layouts.\n");
+                                       cont_err("Please upgrade.\n");
+                               }
                                if (i < content->array.raid_disks * 2 ||
                                    i == bestcnt)
                                        okcnt--;
@@ -1053,9 +1068,12 @@ static int start_array(int mdfd,
                               mddev, okcnt + sparecnt + journalcnt,
                               okcnt + sparecnt + journalcnt == 1 ? "" : "s");
                        if (okcnt < (unsigned)content->array.raid_disks)
-                               fprintf(stderr, " (out of %d)",
+                               fprintf(stderr, " (out of %d)\n",
                                        content->array.raid_disks);
-                       fprintf(stderr, "\n");
+                       else {
+                               fprintf(stderr, "\n");
+                               sysfs_rules_apply(mddev, content);
+                       }
                }
 
                if (st->ss->validate_container) {
@@ -1129,6 +1147,7 @@ static int start_array(int mdfd,
                        rv = ioctl(mdfd, RUN_ARRAY, NULL);
                reopen_mddev(mdfd); /* drop O_EXCL */
                if (rv == 0) {
+                       sysfs_rules_apply(mddev, content);
                        if (c->verbose >= 0) {
                                pr_err("%s has been started with %d drive%s",
                                       mddev, okcnt, okcnt==1?"":"s");
@@ -1206,6 +1225,9 @@ static int start_array(int mdfd,
                        return 0;
                }
                pr_err("failed to RUN_ARRAY %s: %s\n", mddev, strerror(errno));
+               if (errno == 524 /* ENOTSUP */ &&
+                   content->array.level == 0 && content->array.layout == 0)
+                       cont_err("Please use --update=layout-original or --update=layout-alternate\n");
 
                if (!enough(content->array.level, content->array.raid_disks,
                            content->array.layout, 1, avail))
@@ -1313,13 +1335,13 @@ int Assemble(struct supertype *st, char *mddev,
         *    START_ARRAY
         *
         */
-       int rv;
-       int mdfd;
+       int rv = -1;
+       int mdfd = -1;
        int clean;
        int auto_assem = (mddev == NULL && !ident->uuid_set &&
                          ident->super_minor == UnSet && ident->name[0] == 0 &&
                          (ident->container == NULL || ident->member == NULL));
-       struct devs *devices;
+       struct devs *devices = NULL;
        char *devmap;
        int *best = NULL; /* indexed by raid_disk */
        int bestcnt = 0;
@@ -1417,7 +1439,7 @@ try_again:
                        pr_err("Found some drive for an array that is already active: %s\n",
                               mp->path);
                        pr_err("giving up.\n");
-                       return 1;
+                       goto out;
                }
                for (dv = pre_exist->devs; dv; dv = dv->next) {
                        /* We want to add this device to our list,
@@ -1460,6 +1482,10 @@ try_again:
                                name = content->name;
                        break;
                }
+               if (mddev && map_by_name(&map, mddev) != NULL) {
+                       pr_err("Cannot create device with %s because is in use\n", mddev);
+                       goto out;
+               }
                if (!auto_assem)
                        /* If the array is listed in mdadm.conf or on
                         * command line, then we trust the name
@@ -1490,7 +1516,7 @@ try_again:
                st->ss->free_super(st);
                if (auto_assem)
                        goto try_again;
-               return 1;
+               goto out;
        }
        mddev = chosen_name;
        if (pre_exist == NULL) {
@@ -1509,7 +1535,7 @@ try_again:
                        st->ss->free_super(st);
                        if (auto_assem)
                                goto try_again;
-                       return 1;
+                       goto out;
                }
                /* just incase it was started but has no content */
                ioctl(mdfd, STOP_ARRAY, NULL);
@@ -1530,18 +1556,23 @@ try_again:
        devcnt = load_devices(devices, devmap, ident, &st, devlist,
                              c, content, mdfd, mddev,
                              &most_recent, &bestcnt, &best, inargv);
-       if (devcnt < 0)
-               return 1;
+       if (devcnt < 0) {
+               mdfd = -3;
+               /*
+                * devices is already freed in load_devices, so set devices
+                * to NULL to avoid double free devices.
+                */
+               devices = NULL;
+               goto out;
+       }
 
        if (devcnt == 0) {
                pr_err("no devices found for %s\n",
                       mddev);
                if (st)
                        st->ss->free_super(st);
-               close(mdfd);
-               free(devices);
                free(devmap);
-               return 1;
+               goto out;
        }
 
        if (c->update && strcmp(c->update, "byteorder")==0)
@@ -1655,32 +1686,24 @@ try_again:
                                 : (O_RDONLY|O_EXCL)))< 0) {
                        pr_err("Cannot open %s: %s\n",
                               devices[j].devname, strerror(errno));
-                       close(mdfd);
-                       free(devices);
-                       return 1;
+                       goto out;
                }
                if (st->ss->load_super(st,fd, NULL)) {
                        close(fd);
                        pr_err("RAID superblock has disappeared from %s\n",
                               devices[j].devname);
-                       close(mdfd);
-                       free(devices);
-                       return 1;
+                       goto out;
                }
                close(fd);
        }
        if (st->sb == NULL) {
                pr_err("No suitable drives found for %s\n", mddev);
-               close(mdfd);
-               free(devices);
-               return 1;
+               goto out;
        }
        st->ss->getinfo_super(st, content, NULL);
        if (sysfs_init(content, mdfd, NULL)) {
                pr_err("Unable to initialize sysfs\n");
-               close(mdfd);
-               free(devices);
-               return 1;
+               goto out;
        }
 
        /* after reload context, store journal_clean in context */
@@ -1700,6 +1723,9 @@ try_again:
                else
                        desired_state = (1<<MD_DISK_ACTIVE) | (1<<MD_DISK_SYNC);
 
+               desired_state |= devices[j].i.disk.state & ((1<<MD_DISK_FAILFAST) |
+                                                           (1<<MD_DISK_WRITEMOSTLY));
+
                if (!devices[j].uptodate)
                        continue;
 
@@ -1746,17 +1772,13 @@ try_again:
                if (fd < 0) {
                        pr_err("Could not open %s for write - cannot Assemble array.\n",
                               devices[chosen_drive].devname);
-                       close(mdfd);
-                       free(devices);
-                       return 1;
+                       goto out;
                }
                if (st->ss->store_super(st, fd)) {
                        close(fd);
                        pr_err("Could not re-write superblock on %s\n",
                               devices[chosen_drive].devname);
-                       close(mdfd);
-                       free(devices);
-                       return 1;
+                       goto out;
                }
                if (c->verbose >= 0)
                        pr_err("Marking array %s as 'clean'\n",
@@ -1814,9 +1836,7 @@ try_again:
                        pr_err("Failed to restore critical section for reshape, sorry.\n");
                        if (c->backup_file == NULL)
                                cont_err("Possibly you needed to specify the --backup-file\n");
-                       close(mdfd);
-                       free(devices);
-                       return err;
+                       goto out;
                }
        }
 
@@ -1844,6 +1864,7 @@ try_again:
        if (rv == 1 && !pre_exist)
                ioctl(mdfd, STOP_ARRAY, NULL);
        free(devices);
+out:
        map_unlock(&map);
        if (rv == 0) {
                wait_for(chosen_name, mdfd);
@@ -1874,10 +1895,14 @@ try_again:
                                usecs <<= 1;
                        }
                }
-       } else
+       } else if (mdfd >= 0)
                close(mdfd);
 
        /* '2' means 'OK, but not started yet' */
+       if (rv == -1) {
+               free(devices);
+               return 1;
+       }
        return rv == 2 ? 0 : rv;
 }
 
@@ -2009,6 +2034,15 @@ int assemble_container_content(struct supertype *st, int mdfd,
                        free(avail);
                        return err;
                }
+       } else if (c->force) {
+               /* Set the array as 'clean' so that we can proceed with starting
+                * it even if we don't have all devices. Mdmon doesn't care
+                * if the dirty flag is set in metadata, it will start managing
+                * it anyway.
+                * This is really important for raid456 (RWH case), other levels
+                * are started anyway.
+                */
+               content->array.state |= 1;
        }
 
        if (enough(content->array.level, content->array.raid_disks,
@@ -2028,20 +2062,36 @@ int assemble_container_content(struct supertype *st, int mdfd,
        }
        free(avail);
 
-       if (c->runstop <= 0 &&
-           (working + preexist + expansion) <
-           content->array.working_disks) {
-               if (c->export && result)
-                       *result |= INCR_UNSAFE;
-               else if (c->verbose >= 0) {
-                       pr_err("%s assembled with %d device%s",
-                              chosen_name, preexist + working,
-                              preexist + working == 1 ? "":"s");
-                       if (preexist)
-                               fprintf(stderr, " (%d new)", working);
-                       fprintf(stderr, " but not safe to start\n");
+       if ((working + preexist + expansion) < content->array.working_disks) {
+               if (c->runstop <= 0) {
+                       if (c->export && result)
+                               *result |= INCR_UNSAFE;
+                       else if (c->verbose >= 0) {
+                               pr_err("%s assembled with %d device%s",
+                                       chosen_name, preexist + working,
+                                       preexist + working == 1 ? "":"s");
+                               if (preexist)
+                                       fprintf(stderr, " (%d new)", working);
+                               fprintf(stderr, " but not safe to start\n");
+                               if (c->force)
+                                       pr_err("Consider --run to start array as degraded.\n");
+                       }
+                       return 1;
+               } else if (content->array.level >= 4 &&
+                          content->array.level <= 6 &&
+                          content->resync_start != MaxSector &&
+                          c->force) {
+                       /* Don't inform the kernel that the array is not
+                        * clean and requires resync.
+                        */
+                       content->resync_start = MaxSector;
+                       err = sysfs_set_num(content, NULL, "resync_start",
+                                           MaxSector);
+                       if (err)
+                               return 1;
+                       pr_err("%s array state forced to clean. It may cause data corruption.\n",
+                               chosen_name);
                }
-               return 1;
        }
 
 
@@ -2052,8 +2102,22 @@ int assemble_container_content(struct supertype *st, int mdfd,
                                   spare, &c->backup_file, c->verbose) == 1)
                        return 1;
 
-               err = sysfs_set_str(content, NULL,
-                                   "array_state", "readonly");
+               if (content->reshape_progress == 0) {
+                       /* If reshape progress is 0 - we are assembling the
+                        * array that was stopped, before reshape has started.
+                        * Array needs to be started as active, Grow_continue()
+                        * will start the reshape.
+                        */
+                       sysfs_set_num(content, NULL, "reshape_position",
+                                     MaxSector);
+                       err = sysfs_set_str(content, NULL,
+                                           "array_state", "active");
+                       sysfs_set_num(content, NULL, "reshape_position", 0);
+               } else {
+                       err = sysfs_set_str(content, NULL,
+                                           "array_state", "readonly");
+               }
+
                if (err)
                        return 1;
 
@@ -2107,10 +2171,12 @@ int assemble_container_content(struct supertype *st, int mdfd,
                        pr_err("array %s now has %d device%s",
                               chosen_name, working + preexist,
                               working + preexist == 1 ? "":"s");
-               else
+               else {
+                       sysfs_rules_apply(chosen_name, content);
                        pr_err("Started %s with %d device%s",
                               chosen_name, working + preexist,
                               working + preexist == 1 ? "":"s");
+               }
                if (preexist)
                        fprintf(stderr, " (%d new)", working);
                if (expansion)