]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Manage.c
Improve --re-add documentation
[thirdparty/mdadm.git] / Manage.c
index b2ea9765edbd8c4d2513e1bd79bc647156a281e9..3680d6841c53098121646ccd5fddb578c81e4473 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -326,7 +326,7 @@ int Manage_resize(char *devname, int fd, long long size, int raid_disks)
 }
 
 int Manage_subdevs(char *devname, int fd,
-                  mddev_dev_t devlist, int verbose)
+                  mddev_dev_t devlist, int verbose, int test)
 {
        /* do something to each dev.
         * devmode can be
@@ -342,6 +342,7 @@ int Manage_subdevs(char *devname, int fd,
         * For 'f' and 'r', the device can also be a kernel-internal
         * name such as 'sdb'.
         */
+       mddev_dev_t add_devlist = NULL;
        mdu_array_info_t array;
        mdu_disk_info_t disc;
        unsigned long long array_size;
@@ -354,6 +355,7 @@ int Manage_subdevs(char *devname, int fd,
        int ouuid[4];
        int lfd = -1;
        int sysfd = -1;
+       int count = 0; /* number of actions taken */
 
        if (ioctl(fd, GET_ARRAY_INFO, &array)) {
                fprintf(stderr, Name ": cannot get array info for %s\n",
@@ -376,10 +378,12 @@ int Manage_subdevs(char *devname, int fd,
                return 1;
        }
 
+       stb.st_rdev = 0;
        for (dv = devlist, j=0 ; dv; dv = next, j = jnext) {
                unsigned long long ldsize;
                char dvname[20];
                char *dnprintable = dv->devname;
+               char *add_dev = dv->devname;
                int err;
 
                next = dv->next;
@@ -394,6 +398,7 @@ int Manage_subdevs(char *devname, int fd,
                                return 1;
                        }
                        for (; j < array.raid_disks + array.nr_disks ; j++) {
+                               int dev;
                                disc.number = j;
                                if (ioctl(fd, GET_DISK_INFO, &disc))
                                        continue;
@@ -401,9 +406,15 @@ int Manage_subdevs(char *devname, int fd,
                                        continue;
                                if ((disc.state & 1) == 0) /* faulty */
                                        continue;
-                               stb.st_rdev = makedev(disc.major, disc.minor);
+                               dev = makedev(disc.major, disc.minor);
+                               if (stb.st_rdev == dev)
+                                       /* already did that one */
+                                       continue;
+                               stb.st_rdev = dev;
                                next = dv;
-                               jnext = j+1;
+                               /* same slot again next time - things might
+                                * have reshuffled */
+                               jnext = j;
                                sprintf(dvname,"%d:%d", disc.major, disc.minor);
                                dnprintable = dvname;
                                break;
@@ -419,6 +430,7 @@ int Manage_subdevs(char *devname, int fd,
                        }
                        for (; j < array.raid_disks + array.nr_disks; j++) {
                                int sfd;
+                               int dev;
                                disc.number = j;
                                if (ioctl(fd, GET_DISK_INFO, &disc))
                                        continue;
@@ -435,14 +447,38 @@ int Manage_subdevs(char *devname, int fd,
                                        continue;
                                if (errno != ENXIO)
                                        continue;
-                               stb.st_rdev = makedev(disc.major, disc.minor);
+                               dev = makedev(disc.major, disc.minor);
+                               if (stb.st_rdev == dev)
+                                       /* already did that one */
+                                       continue;
+                               stb.st_rdev = dev;
                                next = dv;
-                               jnext = j+1;
+                               /* same slot again next time - things might
+                                * have reshuffled */
+                               jnext = j;
                                dnprintable = dvname;
                                break;
                        }
                        if (jnext == 0)
                                continue;
+               } else if (strcmp(dv->devname, "missing") == 0) {
+                       if (dv->disposition != 'a' || dv->re_add == 0) {
+                               fprintf(stderr, Name ": 'missing' only meaningful "
+                                       "with --re-add\n");
+                               return 1;
+                       }
+                       if (add_devlist == NULL)
+                               add_devlist = conf_get_devs();
+                       if (add_devlist == NULL) {
+                               fprintf(stderr, Name ": no devices to scan for missing members.");
+                               continue;
+                       }
+                       add_dev = add_devlist->devname;
+                       add_devlist = add_devlist->next;
+                       if (add_devlist != NULL)
+                               next = dv;
+                       if (stat(add_dev, &stb) < 0)
+                               continue;
                } else if (strchr(dv->devname, '/') == NULL &&
                           strlen(dv->devname) < 50) {
                        /* Assume this is a kernel-internal name like 'sda1' */
@@ -518,39 +554,44 @@ int Manage_subdevs(char *devname, int fd,
                                return 1;
                        }
                        /* Make sure it isn't in use (in 2.6 or later) */
-                       tfd = dev_open(dv->devname, O_RDONLY|O_EXCL|O_DIRECT);
+                       tfd = dev_open(add_dev, O_RDONLY|O_EXCL|O_DIRECT);
+                       if (tfd < 0 && add_dev != dv->devname)
+                               continue;
                        if (tfd < 0) {
                                fprintf(stderr, Name ": Cannot open %s: %s\n",
                                        dv->devname, strerror(errno));
                                return 1;
                        }
-                       remove_partitions(tfd);
 
                        st = dup_super(tst);
 
                        if (array.not_persistent==0)
                                st->ss->load_super(st, tfd, NULL);
 
-                       if (!get_dev_size(tfd, dv->devname, &ldsize)) {
+                       if (add_dev == dv->devname) {
+                               if (!get_dev_size(tfd, dv->devname, &ldsize)) {
+                                       close(tfd);
+                                       return 1;
+                               }
+                       } else if (!get_dev_size(tfd, NULL, &ldsize)) {
                                close(tfd);
-                               return 1;
+                               continue;
                        }
-                       close(tfd);
-
 
                        if (!tst->ss->external &&
                            array.major_version == 0 &&
                            md_get_version(fd)%100 < 2) {
+                               close(tfd);
                                if (ioctl(fd, HOT_ADD_DISK,
                                          (unsigned long)stb.st_rdev)==0) {
                                        if (verbose >= 0)
                                                fprintf(stderr, Name ": hot added %s\n",
-                                                       dv->devname);
+                                                       add_dev);
                                        continue;
                                }
 
                                fprintf(stderr, Name ": hot add failed for %s: %s\n",
-                                       dv->devname, strerror(errno));
+                                       add_dev, strerror(errno));
                                return 1;
                        }
 
@@ -561,7 +602,9 @@ int Manage_subdevs(char *devname, int fd,
                                 * For 'external' array (well, container based),
                                 * We can just load the metadata for the array.
                                 */
-                               if (tst->ss->external) {
+                               if (tst->sb)
+                                       /* already loaded */;
+                               else if (tst->ss->external) {
                                        tst->ss->load_super(tst, fd, NULL);
                                } else for (j = 0; j < tst->max_devs; j++) {
                                        char *dev;
@@ -587,6 +630,7 @@ int Manage_subdevs(char *devname, int fd,
                                }
                                /* FIXME this is a bad test to be using */
                                if (!tst->sb) {
+                                       close(tfd);
                                        fprintf(stderr, Name ": cannot find valid superblock in this array - HELP\n");
                                        return 1;
                                }
@@ -594,6 +638,9 @@ int Manage_subdevs(char *devname, int fd,
                                /* Make sure device is large enough */
                                if (tst->ss->avail_size(tst, ldsize/512) <
                                    array_size) {
+                                       close(tfd);
+                                       if (add_dev != dv->devname)
+                                               continue;
                                        fprintf(stderr, Name ": %s not large enough to join array\n",
                                                dv->devname);
                                        return 1;
@@ -629,23 +676,41 @@ int Manage_subdevs(char *devname, int fd,
                                                        disc.state |= 1 << MD_DISK_WRITEMOSTLY;
                                                if (dv->writemostly == 2)
                                                        disc.state &= ~(1 << MD_DISK_WRITEMOSTLY);
+                                               remove_partitions(tfd);
+                                               close(tfd);
+                                               tfd = -1;
                                                /* don't even try if disk is marked as faulty */
                                                errno = 0;
                                                if ((disc.state & 1) == 0 &&
                                                    ioctl(fd, ADD_NEW_DISK, &disc) == 0) {
                                                        if (verbose >= 0)
-                                                               fprintf(stderr, Name ": re-added %s\n", dv->devname);
+                                                               fprintf(stderr, Name ": re-added %s\n", add_dev);
+                                                       count++;
                                                        continue;
                                                }
                                                if (errno == ENOMEM || errno == EROFS) {
+                                                       close(tfd);
                                                        fprintf(stderr, Name ": add new device failed for %s: %s\n",
-                                                               dv->devname, strerror(errno));
+                                                               add_dev, strerror(errno));
+                                                       if (add_dev != dv->devname)
+                                                               continue;
                                                        return 1;
                                                }
                                                /* fall back on normal-add */
                                        }
                                }
+                               if (add_dev != dv->devname) {
+                                       if (verbose > 0)
+                                               fprintf(stderr, Name
+                                                       ": --re-add for %s to %s is not possible\n",
+                                                       add_dev, devname);
+                                       if (tfd >= 0)
+                                               close(tfd);
+                                       continue;
+                               }
                                if (dv->re_add) {
+                                       if (tfd >= 0)
+                                               close(tfd);
                                        fprintf(stderr, Name
                                                ": --re-add for %s to %s is not possible\n",
                                                dv->devname, devname);
@@ -661,6 +726,11 @@ int Manage_subdevs(char *devname, int fd,
                                        return 1;
                                }
                        }
+                       /* committed to really trying this device now*/
+                       if (tfd >= 0) {
+                               remove_partitions(tfd);
+                               close(tfd);
+                       }
                        /* in 2.6.17 and earlier, version-1 superblocks won't
                         * use the number we write, but will choose a free number.
                         * we must choose the same free number, which requires
@@ -891,9 +961,10 @@ int Manage_subdevs(char *devname, int fd,
                        }
                        if (lfd >= 0)
                                close(lfd);
+                       count++;
                        if (verbose >= 0)
-                               fprintf(stderr, Name ": hot removed %s\n",
-                                       dnprintable);
+                               fprintf(stderr, Name ": hot removed %s from %s\n",
+                                       dnprintable, devname);
                        break;
 
                case 'f': /* set faulty */
@@ -910,14 +981,16 @@ int Manage_subdevs(char *devname, int fd,
                        if (sysfd >= 0)
                                close(sysfd);
                        sysfd = -1;
+                       count++;
                        if (verbose >= 0)
                                fprintf(stderr, Name ": set %s faulty in %s\n",
                                        dnprintable, devname);
                        break;
                }
        }
+       if (test && count == 0)
+               return 2;
        return 0;
-
 }
 
 int autodetect(void)
@@ -932,4 +1005,57 @@ int autodetect(void)
        }
        return rv;
 }
+
+int Update_subarray(char *dev, char *subarray, char *update, mddev_ident_t ident, int quiet)
+{
+       struct supertype supertype, *st = &supertype;
+       int fd, rv = 2;
+
+       memset(st, 0, sizeof(*st));
+       if (snprintf(st->subarray, sizeof(st->subarray), "%s", subarray) >=
+           sizeof(st->subarray)) {
+               if (!quiet)
+                       fprintf(stderr,
+                               Name ": Input overflow for subarray '%s' > %zu bytes\n",
+                               subarray, sizeof(st->subarray) - 1);
+               return 2;
+       }
+
+       fd = open_subarray(dev, st, quiet);
+       if (fd < 0)
+               return 2;
+
+       if (!st->ss->update_subarray) {
+               if (!quiet)
+                       fprintf(stderr,
+                               Name ": Operation not supported for %s metadata\n",
+                               st->ss->name);
+               goto free_super;
+       }
+
+       if (mdmon_running(st->devnum))
+               st->update_tail = &st->updates;
+
+       rv = st->ss->update_subarray(st, update, ident);
+
+       if (rv) {
+               if (!quiet)
+                       fprintf(stderr, Name ": Failed to update %s of subarray-%s in %s\n",
+                               update, subarray, dev);
+       } else if (st->update_tail)
+               flush_metadata_updates(st);
+       else
+               st->ss->sync_metadata(st);
+
+       if (rv == 0 && strcmp(update, "name") == 0 && !quiet)
+               fprintf(stderr,
+                       Name ": Updated subarray-%s name from %s, UUIDs may have changed\n",
+                       subarray, dev);
+
+ free_super:
+       st->ss->free_super(st);
+       close(fd);
+
+       return rv;
+}
 #endif