tests/env-ddf-template: add helper function for checksums

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 383b149e739d42a5ae20f8c2d2485ddf80f3548c..86b4c894b260c4b1d13eff1c3224775045badc46 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2012 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -48,7 +48,7 @@ static int name_matches(char *found, char *required, char *homehost)
 static int is_member_busy(char *metadata_version)
 {
        /* check if the given member array is active */
-       struct mdstat_ent *mdstat = mdstat_read(1, 0);
+       struct mdstat_ent *mdstat = mdstat_read(0, 0);
        struct mdstat_ent *ent;
        int busy = 0;
 
@@ -105,6 +105,7 @@ static int ident_matches(struct mddev_ident *ident,
                return 0;
        }
        if (ident->raid_disks != UnSet &&
+           content->array.raid_disks != 0 && /* metadata doesn't know how many to expect */
            ident->raid_disks!= content->array.raid_disks) {
                if (devname)
                        pr_err("%s requires wrong number of drives.\n",
@@ -170,8 +171,20 @@ static int select_devices(struct mddev_dev *devlist,
                if (tmpdev->used > 1)
                        continue;
 
-               if (ident->devices &&
-                   !match_oneof(ident->devices, devname)) {
+               if (ident->container) {
+                       if (ident->container[0] == '/' &&
+                           !same_dev(ident->container, devname)) {
+                               if (report_mismatch)
+                                       pr_err("%s is not the container required (%s)\n",
+                                              devname, ident->container);
+                               continue;
+                       }
+               } else if (ident->devices &&
+                          !match_oneof(ident->devices, devname)) {
+                       /* Note that we ignore the "device=" identifier if a
+                        * "container=" is given.  Checking both is unnecessarily
+                        * complicated.
+                        */
                        if (report_mismatch)
                                pr_err("%s is not one of %s\n", devname, ident->devices);
                        continue;
@@ -288,29 +301,20 @@ static int select_devices(struct mddev_dev *devlist,
                        }
                        close(dfd);
 
-                       if (ident->container) {
-                               if (ident->container[0] == '/' &&
-                                   !same_dev(ident->container, devname)) {
+                       if (ident->container && ident->container[0] != '/') {
+                               /* we have a uuid */
+                               int uuid[4];
+
+                               content = *contentp;
+                               tst->ss->getinfo_super(tst, content, NULL);
+
+                               if (!parse_uuid(ident->container, uuid) ||
+                                   !same_uuid(content->uuid, uuid, tst->ss->swapuuid)) {
                                        if (report_mismatch)
-                                               pr_err("%s is not the container required (%s)\n",
-                                                      devname, ident->container);
+                                               pr_err("%s has wrong UUID to be required container\n",
+                                                      devname);
                                        goto loop;
                                }
-                               if (ident->container[0] != '/') {
-                                       /* we have a uuid */
-                                       int uuid[4];
-
-                                       content = *contentp;
-                                       tst->ss->getinfo_super(tst, content, NULL);
-
-                                       if (!parse_uuid(ident->container, uuid) ||
-                                           !same_uuid(content->uuid, uuid, tst->ss->swapuuid)) {
-                                               if (report_mismatch)
-                                                       pr_err("%s has wrong UUID to be required container\n",
-                                                              devname);
-                                               goto loop;
-                                       }
-                               }
                        }
                        /* It is worth looking inside this container.
                         */
@@ -560,7 +564,7 @@ static int load_devices(struct devs *devices, char *devmap,
 #ifndef MDASSEMBLE
        int bitmap_done = 0;
 #endif
-       int most_recent = 0;
+       int most_recent = -1;
        int bestcnt = 0;
        int *best = *bestp;
 
@@ -691,10 +695,12 @@ 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.events
-                   > devices[most_recent].i.events &&
-                   devices[devcnt].i.disk.state == 6)
+               if (devices[devcnt].i.disk.state == 6) {
+                       if (most_recent < 0 ||
+                           devices[devcnt].i.events
+                           > devices[most_recent].i.events)
                                most_recent = devcnt;
+               }
 
                if (content->array.level == LEVEL_MULTIPATH)
                        /* with multipath, the raid_disk from the superblock is meaningless */
@@ -762,7 +768,8 @@ static int load_devices(struct devs *devices, char *devmap,
                }
                devcnt++;
        }
-       *most_recentp = most_recent;
+       if (most_recent >= 0)
+               *most_recentp = most_recent;
        *bestcntp = bestcnt;
        *bestp = best;
        return devcnt;
@@ -1003,6 +1010,15 @@ static int start_array(int mdfd,
                if (content->reshape_active &&
                    !(content->reshape_active & RESHAPE_NO_BACKUP) &&
                    content->delta_disks <= 0) {
+                       if (!c->backup_file) {
+                               pr_err("%s: Need a backup file to complete reshape of this array.\n",
+                                      mddev);
+                               pr_err("Please provided one with \"--backup-file=...\"\n");
+                               if (c->update &&
+                                   strcmp(c->update, "revert-reshape") == 0)
+                                       pr_err("(Don't specify --update=revert-reshape again, that part succeeded.)\n");
+                               return 1;
+                       }
                        rv = sysfs_set_str(content, NULL,
                                           "array_state", "readonly");
                        if (rv == 0)
@@ -1066,8 +1082,6 @@ static int start_array(int mdfd,
                                        }
                                }
                        }
-                       printf("l=%d o=%d r=%d w=%d\n",content->array.level,
-                              okcnt, content->array.raid_disks, was_forced);
                        if (content->array.level == 6 &&
                            okcnt + 1 == (unsigned)content->array.raid_disks &&
                            was_forced) {
@@ -1461,7 +1475,7 @@ try_again:
                /* If this device thinks that 'most_recent' has failed, then
                 * we must reject this device.
                 */
-               if (j != most_recent &&
+               if (j != most_recent && !c->force &&
                    content->array.raid_disks > 0 &&
                    devices[most_recent].i.disk.raid_disk >= 0 &&
                    devmap[j * content->array.raid_disks + devices[most_recent].i.disk.raid_disk] == 0) {
@@ -1803,7 +1817,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
                                working++;
                } else if (errno == EEXIST)
                        preexist++;
-       if (working + expansion == 0)
+       if (working + expansion == 0 && c->runstop <= 0)
                return 1;/* Nothing new, don't try to start */
 
        map_update(&map, fd2devnm(mdfd),