]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
Add device files created with --auto to list of known device files.
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index 1bdc55d174fe5a3c26c287b424ae09f07d2da07f..45c59b379d251fcb01a4e67469bdb172dc35fb3c 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -25,6 +25,9 @@
  *           The University of New South Wales
  *           Sydney, 2052
  *           Australia
+ *
+ *    Additions for bitmap and async RAID options, Copyright (C) 2003-2004, 
+ *    Paul Clements, SteelEye Technology, Inc.
  */
 
 #include "mdadm.h"
@@ -47,6 +50,7 @@ int main(int argc, char *argv[])
        int level = UnSet;
        int layout = UnSet;
        int raiddisks = 0;
+       int max_disks = MD_SB_DISKS;
        int sparedisks = 0;
        struct mddev_ident_s ident;
        char *configfile = NULL;
@@ -56,6 +60,9 @@ int main(int argc, char *argv[])
        char devmode = 0;
        int runstop = 0;
        int readonly = 0;
+       int bitmap_fd = -1;
+       char *bitmap_file = NULL;
+       int bitmap_chunk = UnSet;
        int SparcAdjust = 0;
        mddev_dev_t devlist = NULL;
        mddev_dev_t *devlistend = & devlist;
@@ -87,6 +94,8 @@ int main(int argc, char *argv[])
 
        int mdfd = -1;
 
+       srandom(time(0) ^ getpid());
+
        ident.uuid_set=0;
        ident.level = UnSet;
        ident.raid_disks = UnSet;
@@ -94,6 +103,8 @@ int main(int argc, char *argv[])
        ident.devices=0;
        ident.spare_group = NULL;
        ident.autof = 0;
+       ident.st = NULL;
+       ident.bitmap_fd = -1;
 
        while ((option_index = -1) ,
               (opt=getopt_long(argc, argv,
@@ -124,10 +135,13 @@ int main(int argc, char *argv[])
                        fputs(Version, stderr);
                        exit(0);
 
-               case 'v': verbose = 1;
+               case 'v': verbose++;
                        continue;
 
-               case 'b': brief = 1;
+               case 'b':
+                       if (mode == ASSEMBLE || mode == BUILD || mode == CREATE || mode == GROW)
+                               break; /* b means bitmap */
+                       brief = 1;
                        continue;
 
                case ':':
@@ -158,6 +172,7 @@ int main(int argc, char *argv[])
                case '#':
                case 'D':
                case 'E':
+               case 'X':
                case 'Q': newmode = MISC; break;
                case 'R':
                case 'S':
@@ -288,6 +303,7 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": unrecognised metadata identifier: %s\n", optarg);
                                exit(2);
                        }
+                       max_disks = ss->max_devs;
                        continue;
 
                case O(GROW,'z'):
@@ -411,17 +427,11 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        raiddisks = strtol(optarg, &c, 10);
-                       if (!optarg[0] || *c || raiddisks<=0 || raiddisks > MD_SB_DISKS) {
+                       if (!optarg[0] || *c || raiddisks<=0) {
                                fprintf(stderr, Name ": invalid number of raid devices: %s\n",
                                        optarg);
                                exit(2);
                        }
-                       if (raiddisks == 1 &&  !force && level != -5) {
-                               fprintf(stderr, Name ": '1' is an unusual number of drives for an array, so it is probably\n"
-                                       "     a mistake.  If you really mean it you will need to specify --force before\n"
-                                       "     setting the number of drives.\n");
-                               exit(2);
-                       }
                        ident.raid_disks = raiddisks;
                        continue;
 
@@ -437,7 +447,7 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        sparedisks = strtol(optarg, &c, 10);
-                       if (!optarg[0] || *c || sparedisks < 0 || sparedisks > MD_SB_DISKS - raiddisks) {
+                       if (!optarg[0] || *c || sparedisks < 0) {
                                fprintf(stderr, Name ": invalid number of spare-devices: %s\n",
                                        optarg);
                                exit(2);
@@ -483,6 +493,7 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(BUILD,'f'): /* force honouring '-n 1' */
+               case O(GROW,'f'): /* ditto */
                case O(CREATE,'f'): /* force honouring of device list */
                case O(ASSEMBLE,'f'): /* force assembly */
                case O(MISC,'f'): /* force zero */
@@ -573,6 +584,9 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(MONITOR,'d'): /* delay in seconds */
+               case O(GROW, 'd'):
+               case O(BUILD,'d'): /* delay for bitmap updates */
+               case O(CREATE,'d'):
                        if (delay)
                                fprintf(stderr, Name ": only specify delay once. %s ignored.\n",
                                        optarg);
@@ -654,6 +668,7 @@ int main(int argc, char *argv[])
                case O(MISC,'K'):
                case O(MISC,'R'):
                case O(MISC,'S'):
+               case O(MISC,'X'):
                case O(MISC,'o'):
                case O(MISC,'w'):
                        if (devmode && devmode != opt &&
@@ -675,6 +690,43 @@ int main(int argc, char *argv[])
                        }
                        SparcAdjust = 1;
                        continue;
+
+               case O(ASSEMBLE,'b'): /* here we simply set the bitmap file */
+                       if (!optarg) {
+                               fprintf(stderr, Name ": bitmap file needed with -b in --assemble mode\n");
+                               exit(2);
+                       }
+                       if (strcmp(optarg, "internal")==0) {
+                               fprintf(stderr, Name ": there is no need to specify --bitmap when assembling arrays with internal bitmaps\n");
+                               continue;
+                       }
+                       bitmap_fd = open(optarg, O_RDWR);
+                       if (!*optarg || bitmap_fd < 0) {
+                               fprintf(stderr, Name ": cannot open bitmap file %s: %s\n", optarg, strerror(errno));
+                               exit(2);
+                       }
+                       ident.bitmap_fd = bitmap_fd; /* for Assemble */
+                       continue;
+
+               case O(GROW,'b'):
+               case O(BUILD,'b'):
+               case O(CREATE,'b'): /* here we create the bitmap */
+                       bitmap_file = optarg;
+                       continue;
+
+               case O(GROW,4):
+               case O(BUILD,4):
+               case O(CREATE,4): /* bitmap chunksize */
+                       bitmap_chunk = strtol(optarg, &c, 10);
+                       if (!optarg[0] || *c || bitmap_chunk < 0 ||
+                                       bitmap_chunk & (bitmap_chunk - 1)) {
+                               fprintf(stderr, Name ": invalid bitmap chunksize: %s\n",
+                                               optarg);
+                               exit(2);
+                       }
+                       /* convert K to B, chunk of 0K means 512B */
+                       bitmap_chunk = bitmap_chunk ? bitmap_chunk * 1024 : 512;
+                       continue;
                }
                /* We have now processed all the valid options. Anything else is
                 * an error
@@ -725,6 +777,27 @@ int main(int argc, char *argv[])
                }
        }
 
+       if (raiddisks) {
+               if (raiddisks > max_disks) {
+                       fprintf(stderr, Name ": invalid number of raid devices: %d\n",
+                               raiddisks);
+                       exit(2);
+               }
+               if (raiddisks == 1 &&  !force && level != -5) {
+                       fprintf(stderr, Name ": '1' is an unusual number of drives for an array, so it is probably\n"
+                               "     a mistake.  If you really mean it you will need to specify --force before\n"
+                               "     setting the number of drives.\n");
+                       exit(2);
+               }
+       }
+       if (sparedisks) {
+               if ( sparedisks > max_disks - raiddisks) {
+                       fprintf(stderr, Name ": invalid number of spare-devices: %d\n",
+                               sparedisks);
+                       exit(2);
+               }
+       }
+
        rv = 0;
        switch(mode) {
        case MANAGE:
@@ -737,7 +810,7 @@ int main(int argc, char *argv[])
                if (!rv && readonly < 0)
                        rv = Manage_ro(devlist->devname, mdfd, readonly);
                if (!rv && runstop)
-                       rv = Manage_runstop(devlist->devname, mdfd, runstop);
+                       rv = Manage_runstop(devlist->devname, mdfd, runstop, 0);
                break;
        case ASSEMBLE:
                if (devs_found == 1 && ident.uuid_set == 0 &&
@@ -749,7 +822,8 @@ int main(int argc, char *argv[])
                                        devlist->devname);
                                rv |= 1;
                        } else {
-                               mdfd = open_mddev(devlist->devname, array_ident->autof);
+                               mdfd = open_mddev(devlist->devname, 
+                                                 array_ident->autof ? array_ident->autof : autof);
                                if (mdfd < 0)
                                        rv |= 1;
                                else {
@@ -776,7 +850,8 @@ int main(int argc, char *argv[])
                                        rv |= 1;
                                        continue;
                                }
-                               mdfd = open_mddev(dv->devname, array_ident->autof);
+                               mdfd = open_mddev(dv->devname, 
+                                                 array_ident->autof ?array_ident->autof : autof);
                                if (mdfd < 0) {
                                        rv |= 1;
                                        continue;
@@ -794,7 +869,8 @@ int main(int argc, char *argv[])
                        } else
                                for (; array_list; array_list = array_list->next) {
                                        mdu_array_info_t array;
-                                       mdfd = open_mddev(array_list->devname, array_list->autof);
+                                       mdfd = open_mddev(array_list->devname, 
+                                                         array_list->autof ? array_list->autof : autof);
                                        if (mdfd < 0) {
                                                rv |= 1;
                                                continue;
@@ -812,9 +888,31 @@ int main(int argc, char *argv[])
                }
                break;
        case BUILD:
-               rv = Build(devlist->devname, mdfd, chunk, level, layout, raiddisks, devlist->next, assume_clean);
+               if (bitmap_chunk == UnSet) bitmap_chunk = DEFAULT_BITMAP_CHUNK;
+               if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+               if (bitmap_file) {
+                       if (strcmp(bitmap_file, "internal")==0) {
+                               fprintf(stderr, Name ": 'internal' bitmaps not supported with --build\n");
+                               rv |= 1;
+                               break;
+                       }
+                       bitmap_fd = open(bitmap_file, O_RDWR,0);
+                       if (bitmap_fd < 0 && errno != ENOENT) {
+                               perror(Name ": cannot create bitmap file");
+                               rv |= 1;
+                               break;
+                       }
+                       if (bitmap_fd < 0) {
+                               bitmap_fd = CreateBitmap(bitmap_file, force, NULL,
+                                                        bitmap_chunk, delay, size);
+                       }
+               }
+               rv = Build(devlist->devname, mdfd, chunk, level, layout,
+                          raiddisks, devlist->next, assume_clean,
+                          bitmap_file, bitmap_chunk, delay);
                break;
        case CREATE:
+               if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
                if (ss == NULL) {
                        for(i=0; !ss && superlist[i]; i++) 
                                ss = superlist[i]->match_metadata_desc("default");
@@ -826,7 +924,8 @@ int main(int argc, char *argv[])
 
                rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
                            raiddisks, sparedisks,
-                           devs_found-1, devlist->next, runstop, verbose, force);
+                           devs_found-1, devlist->next, runstop, verbose, force,
+                           bitmap_file, bitmap_chunk, delay);
                break;
        case MISC:
 
@@ -841,23 +940,13 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
                                exit(1);
                        }
-                       rv = Examine(devlist, scan?!verbose:brief, scan, SparcAdjust, ss);
+                       rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss);
                } else {
                        if (devlist == NULL) {
-                               if ((devmode == 'S' ||devmode=='D') && scan) {
-                                       /* apply to all devices in /proc/mdstat */
+                               if (devmode=='D' && scan) {
+                                       /* apply --detail to all devices in /proc/mdstat */
                                        struct mdstat_ent *ms = mdstat_read(0);
                                        struct mdstat_ent *e;
-                                       if (devmode == 'S') {
-                                               /* reverse order so that arrays made of arrays are stopped properly */
-                                               struct mdstat_ent *sm = NULL;
-                                               while ((e=ms) != NULL) {
-                                                       ms = e->next;
-                                                       e->next = sm;
-                                                       sm = e;
-                                               }
-                                               ms = sm;
-                                       }
                                        for (e=ms ; e ; e=e->next) {
                                                char *name = get_md_name(e->devnum);
 
@@ -866,18 +955,43 @@ int main(int argc, char *argv[])
                                                                e->dev);
                                                        continue;
                                                }
-                                               if (devmode == 'D')
-                                                       rv |= Detail(name, !verbose, test);
-                                               else if (devmode=='S') {
+                                               rv |= Detail(name, verbose>1?0:verbose+1, test);
+                                               put_md_name(name);
+                                       }
+                               } else  if (devmode == 'S' && scan) {
+                                       /* apply --stop to all devices in /proc/mdstat */
+                                       /* Due to possible stacking of devices, repeat until
+                                        * nothing more can be stopped
+                                        */
+                                       int progress=1, err;
+                                       int last = 0;
+                                       do {
+                                               struct mdstat_ent *ms = mdstat_read(0);
+                                               struct mdstat_ent *e;
+
+                                               if (!progress) last = 1;
+                                               progress = 0; err = 0;
+                                               for (e=ms ; e ; e=e->next) {
+                                                       char *name = get_md_name(e->devnum);
+
+                                                       if (!name) {
+                                                               fprintf(stderr, Name ": cannot find device file for %s\n",
+                                                                       e->dev);
+                                                               continue;
+                                                       }
                                                        mdfd = open_mddev(name, 0);
                                                        if (mdfd >= 0) {
-                                                               rv |= Manage_runstop(name, mdfd, -1);
+                                                               if (Manage_runstop(name, mdfd, -1, !last))
+                                                                       err = 1;
+                                                               else
+                                                                       progress = 1;
                                                                close(mdfd);
                                                        }
+
+                                                       put_md_name(name);
                                                }
-                                               put_md_name(name);
-                                       }
-                               } else {                                                
+                                       } while (!last && err);
+                               } else {
                                        fprintf(stderr, Name ": No devices given.\n");
                                        exit(2);
                                }
@@ -885,19 +999,21 @@ int main(int argc, char *argv[])
                        for (dv=devlist ; dv; dv=dv->next) {
                                switch(dv->disposition) {
                                case 'D':
-                                       rv |= Detail(dv->devname, brief, test); continue;
+                                       rv |= Detail(dv->devname, brief?1+verbose:0, test); continue;
                                case 'K': /* Zero superblock */
                                        rv |= Kill(dv->devname, force); continue;
                                case 'Q':
                                        rv |= Query(dv->devname); continue;
+                               case 'X':
+                                       rv |= ExamineBitmap(dv->devname, brief, ss); continue;
                                }
                                mdfd = open_mddev(dv->devname, 0);
                                if (mdfd>=0) {
                                        switch(dv->disposition) {
                                        case 'R':
-                                               rv |= Manage_runstop(dv->devname, mdfd, 1); break;
+                                               rv |= Manage_runstop(dv->devname, mdfd, 1, 0); break;
                                        case 'S':
-                                               rv |= Manage_runstop(dv->devname, mdfd, -1); break;
+                                               rv |= Manage_runstop(dv->devname, mdfd, -1, 0); break;
                                        case 'o':
                                                rv |= Manage_ro(dv->devname, mdfd, 1); break;
                                        case 'w':
@@ -937,15 +1053,19 @@ int main(int argc, char *argv[])
                                if (rv)
                                        break;
                        }
-               } else if ((size >= 0) + (raiddisks != 0) +  (layout != UnSet) > 1) {
-                       fprintf(stderr, Name ": can change at most one of size, raiddisks, and layout\n");
+               } else if ((size >= 0) + (raiddisks != 0) +  (layout != UnSet) + (bitmap_file != NULL)> 1) {
+                       fprintf(stderr, Name ": can change at most one of size, raiddisks, bitmap, and layout\n");
                        rv = 1;
                        break;
                } else if (layout != UnSet)
                        rv = Manage_reconfig(devlist->devname, mdfd, layout);
                else if (size >= 0 || raiddisks)
                        rv = Manage_resize(devlist->devname, mdfd, size, raiddisks);
-               else 
+               else if (bitmap_file) {
+                       if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+                       rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,
+                                           bitmap_chunk, delay);
+               } else
                        fprintf(stderr, Name ": no changes to --grow\n");
                break;
        }