Add a test.

[thirdparty/mdadm.git] / Manage.c

diff --git a/Manage.c b/Manage.c
index c1debfa97f9ba9ca7e6af8ed019fb72f30e273c5..a91e467c8ff7916ba321d366042b77d3172b6973 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -72,7 +72,7 @@ int Manage_ro(char *devname, int fd, int readonly)
        return 0;                       
 }
 
-int Manage_runstop(char *devname, int fd, int runstop)
+int Manage_runstop(char *devname, int fd, int runstop, int quiet)
 {
        /* Run or stop the array. array must already be configured
         * required >= 0.90.0
@@ -81,8 +81,8 @@ int Manage_runstop(char *devname, int fd, int runstop)
 
        if (runstop == -1 && md_get_version(fd) < 9000) {
                if (ioctl(fd, STOP_MD, 0)) {
-                       fprintf(stderr, Name ": stopping device %s failed: %s\n",
-                               devname, strerror(errno));
+                       if (!quiet) fprintf(stderr, Name ": stopping device %s failed: %s\n",
+                                           devname, strerror(errno));
                        return 1;
                }
        }
@@ -106,8 +106,9 @@ int Manage_runstop(char *devname, int fd, int runstop)
                }
        } else if (runstop < 0){
                if (ioctl(fd, STOP_ARRAY, NULL)) {
-                       fprintf(stderr, Name ": fail to stop array %s: %s\n",
-                               devname, strerror(errno));
+                       if (!quiet)
+                               fprintf(stderr, Name ": fail to stop array %s: %s\n",
+                                       devname, strerror(errno));
                        return 1;
                }
        }
@@ -169,8 +170,8 @@ int Manage_subdevs(char *devname, int fd,
        struct stat stb;
        int j;
        int tfd;
-       int save_errno;
-       static char buf[4096];
+       struct supertype *st;
+       void *dsuper = NULL;
 
        if (ioctl(fd, GET_ARRAY_INFO, &array)) {
                fprintf(stderr, Name ": cannot get array info for %s\n",
@@ -195,7 +196,7 @@ int Manage_subdevs(char *devname, int fd,
                        return 1;
                case 'a':
                        /* add the device - hot or cold */
-                       /* Make sure it isn' in use (in 2.6 or later) */
+                       /* Make sure it isn't in use (in 2.6 or later) */
                        tfd = open(dv->devname, O_RDONLY|O_EXCL);
                        if (tfd < 0) {
                                fprintf(stderr, Name ": Cannot open %s: %s\n",
@@ -203,27 +204,56 @@ int Manage_subdevs(char *devname, int fd,
                                return 1;
                        }
                        close(tfd);
-                       if (ioctl(fd, HOT_ADD_DISK, (unsigned long)stb.st_rdev)==0) {
-                               fprintf(stderr, Name ": hot added %s\n",
-                                       dv->devname);
-                               continue;
-                       }
-                       save_errno = errno;
-                       if (read(fd, buf, sizeof(buf)) > 0) {
-                               /* array is active, so don't try to add.
-                                * i.e. something is wrong 
-                                */
+                       if (array.major_version == 0 &&
+                           md_get_version(fd)%100 < 2) {
+                               if (ioctl(fd, HOT_ADD_DISK,
+                                         (unsigned long)stb.st_rdev)==0) {
+                                       fprintf(stderr, Name ": hot added %s\n",
+                                               dv->devname);
+                                       continue;
+                               }
+
                                fprintf(stderr, Name ": hot add failed for %s: %s\n",
-                                       dv->devname, strerror(save_errno));
+                                       dv->devname, strerror(errno));
                                return 1;
                        }
-                       /* try ADD_NEW_DISK.
-                        * we might be creating, we might be assembling,
-                        * it is hard to tell.
-                        * set up number/raid_disk/state just
-                        * in case
+
+                       /* need to find a sample superblock to copy, and
+                        * a spare slot to use 
                         */
-                       for (j=0; j<array.nr_disks; j++) {
+                       st = super_by_version(array.major_version,
+                                             array.minor_version);
+                       if (!st) {
+                               fprintf(stderr, Name ": unsupport array - version %d.%d\n",
+                                       array.major_version, array.minor_version);
+                               return 1;
+                       }
+                       for (j=0; j<st->max_devs; j++) {
+                               char *dev;
+                               int dfd;
+                               disc.number = j;
+                               if (ioctl(fd, GET_DISK_INFO, &disc))
+                                       continue;
+                               if (disc.major==0 && disc.minor==0)
+                                       continue;
+                               if ((disc.state & 4)==0) continue; /* sync */
+                               /* Looks like a good device to try */
+                               dev = map_dev(disc.major, disc.minor);
+                               if (!dev) continue;
+                               dfd = open(dev, O_RDONLY);
+                               if (dfd < 0) continue;
+                               if (st->ss->load_super(st, dfd, &dsuper, NULL)) {
+                                       close(dfd);
+                                       continue;
+                               }
+                               close(dfd);
+                               break;
+                       }
+                       if (!dsuper) {
+                               fprintf(stderr, Name ": cannot find valid superblock in this array - HELP\n");
+                               return 1;
+                       }
+                       for (j=0; j< st->max_devs; j++) {
                                disc.number = j;
                                if (ioctl(fd, GET_DISK_INFO, &disc))
                                        break;
@@ -232,14 +262,18 @@ int Manage_subdevs(char *devname, int fd,
                                if (disc.state & 8) /* removed */
                                        break;
                        }
-                       disc.number =j;
-                       disc.raid_disk = j;
-                       disc.state = 0;
                        disc.major = major(stb.st_rdev);
                        disc.minor = minor(stb.st_rdev);
+                       disc.number =j;
+                       disc.state = 0;
+                       if (dv->writemostly)
+                               disc.state |= 1 << MD_DISK_WRITEMOSTLY;
+                       st->ss->add_to_super(dsuper, &disc);
+                       if (st->ss->write_init_super(st, dsuper, &disc, dv->devname))
+                               return 1;
                        if (ioctl(fd,ADD_NEW_DISK, &disc)) {
-                               fprintf(stderr, Name ": add new device failed for %s: %s\n",
-                                       dv->devname, strerror(errno));
+                               fprintf(stderr, Name ": add new device failed for %s as %d: %s\n",
+                                       dv->devname, j, strerror(errno));
                                return 1;
                        }
                        fprintf(stderr, Name ": added %s\n", dv->devname);