X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=mdadm.c;h=2bd963a58c2fbf9e3158b88bc2cb5938971ddd8b;hp=844f6d4af6bd97c1e0e7b06a620014ab069bef90;hb=9008ed1c9623b7c11775ea8a7be17eb1bde5fd09;hpb=773135f5bdf57219bf7f957b86964ba40d041180 diff --git a/mdadm.c b/mdadm.c index 844f6d4a..2bd963a5 100644 --- a/mdadm.c +++ b/mdadm.c @@ -1,7 +1,7 @@ /* * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2001-2002 Neil Brown + * Copyright (C) 2001-2006 Neil Brown * * * This program is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ * Sydney, 2052 * Australia * - * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, + * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, * Paul Clements, SteelEye Technology, Inc. */ @@ -40,17 +40,16 @@ int main(int argc, char *argv[]) int mode = 0; int opt; int option_index; - char *help_text; char *c; int rv; int i; int chunk = 0; - int size = -1; + long long size = -1; int level = UnSet; int layout = UnSet; int raiddisks = 0; - int max_disks = MD_SB_DISKS; + int max_disks = MD_SB_DISKS; /* just a default */ int sparedisks = 0; struct mddev_ident_s ident; char *configfile = NULL; @@ -63,6 +62,7 @@ int main(int argc, char *argv[]) int write_behind = 0; int bitmap_fd = -1; char *bitmap_file = NULL; + char *backup_file = NULL; int bitmap_chunk = UnSet; int SparcAdjust = 0; mddev_dev_t devlist = NULL; @@ -74,16 +74,23 @@ int main(int argc, char *argv[]) int brief = 0; int force = 0; int test = 0; + int export = 0; int assume_clean = 0; - int autof = 0; /* -2 means create device based on name: - * if it ends mdN, then non-partitioned array N - * if it ends dN, then partitions array N - * -1 means create non-partitioned, choose N - * 1 or more to create partitioned - * If -1 or 1 and name is a 'standard' name, then - * insist on a match of type and number. - */ + char *symlinks = NULL; + /* autof indicates whether and how to create device node. + * bottom 3 bits are style. Rest (when shifted) are number of parts + * 0 - unset + * 1 - don't create (no) + * 2 - if is_standard, then create (yes) + * 3 - create as 'md' - reject is_standard mdp (md) + * 4 - create as 'mdp' - reject is_standard md (mdp) + * 5 - default to md if not is_standard (md in config file) + * 6 - default to mdp if not is_standard (part, or mdp in config file) + */ + int autof = 0; + char *homehost = NULL; + char sys_hostname[256]; char *mailaddr = NULL; char *program = NULL; int delay = 0; @@ -95,8 +102,12 @@ int main(int argc, char *argv[]) int re_add = 0; char *shortopt = short_options; int dosyslog = 0; + int rebuild_map = 0; + int auto_update_home = 0; int copies; + int print_help = 0; + FILE *outf; int mdfd = -1; @@ -111,7 +122,10 @@ int main(int argc, char *argv[]) ident.autof = 0; ident.st = NULL; ident.bitmap_fd = -1; + ident.bitmap_file = NULL; ident.name[0] = 0; + ident.container = NULL; + ident.member = NULL; while ((option_index = -1) , (opt=getopt_long(argc, argv, @@ -121,22 +135,12 @@ int main(int argc, char *argv[]) /* firstly, some mode-independant options */ switch(opt) { case 'h': - help_text = Help; - if (option_index > 0 && + if (option_index > 0 && strcmp(long_options[option_index].name, "help-options")==0) - help_text = OptionHelp; + print_help = 2; else - switch (mode) { - case ASSEMBLE : help_text = Help_assemble; break; - case BUILD : help_text = Help_build; break; - case CREATE : help_text = Help_create; break; - case MANAGE : help_text = Help_manage; break; - case MISC : help_text = Help_misc; break; - case MONITOR : help_text = Help_monitor; break; - case GROW : help_text = Help_grow; break; - } - fputs(help_text,stderr); - exit(0); + print_help = 1; + continue; case 'V': fputs(Version, stderr); @@ -158,6 +162,13 @@ int main(int argc, char *argv[]) } continue; + case 'Y': export++; + continue; + + case HomeHost: + homehost = optarg; + continue; + case ':': case '?': fputs(Usage, stderr); @@ -165,21 +176,21 @@ int main(int argc, char *argv[]) } /* second, figure out the mode. * Some options force the mode. Others - * set the mode if it isn't already + * set the mode if it isn't already */ switch(opt) { case '@': /* just incase they say --manage */ newmode = MANAGE; - shortopt = short_bitmap_auto_options; + shortopt = short_bitmap_options; break; case 'a': case 'r': case 'f': - case 6: /* re-add */ + case ReAdd: /* re-add */ if (!mode) { newmode = MANAGE; - shortopt = short_bitmap_auto_options; + shortopt = short_bitmap_options; } break; @@ -187,7 +198,13 @@ int main(int argc, char *argv[]) case 'B': newmode = BUILD; shortopt = short_bitmap_auto_options; break; case 'C': newmode = CREATE; shortopt = short_bitmap_auto_options; break; case 'F': newmode = MONITOR;break; - case 'G': newmode = GROW; shortopt = short_bitmap_auto_options; break; + case 'G': newmode = GROW; + shortopt = short_bitmap_options; + break; + case 'I': newmode = INCREMENTAL; + shortopt = short_bitmap_auto_options; break; + case AutoDetect: + newmode = AUTODETECT; break; case '#': case 'D': @@ -198,6 +215,8 @@ int main(int argc, char *argv[]) case 'S': case 'o': case 'w': + case 'W': + case Waitclean: case 'K': if (!mode) newmode = MISC; break; } if (mode && newmode == mode) { @@ -217,10 +236,10 @@ int main(int argc, char *argv[]) mode = newmode; } else { /* special case of -c --help */ - if (opt == 'c' && + if (opt == 'c' && ( strncmp(optarg, "--h", 3)==0 || strncmp(optarg, "-h", 2)==0)) { - fputs(Help_config, stderr); + fputs(Help_config, stdout); exit(0); } @@ -236,10 +255,12 @@ int main(int argc, char *argv[]) dv->disposition = devmode; dv->writemostly = writemostly; dv->re_add = re_add; + dv->used = 0; + dv->content = NULL; dv->next = NULL; *devlistend = dv; devlistend = &dv->next; - + devs_found++; continue; } @@ -264,6 +285,8 @@ int main(int argc, char *argv[]) case 'C': case 'F': case 'G': + case 'I': + case AutoDetect: continue; } if (opt == 1) { @@ -286,10 +309,12 @@ int main(int argc, char *argv[]) dv->disposition = devmode; dv->writemostly = writemostly; dv->re_add = re_add; + dv->used = 0; + dv->content = NULL; dv->next = NULL; *devlistend = dv; devlistend = &dv->next; - + devs_found++; continue; } @@ -313,6 +338,10 @@ int main(int argc, char *argv[]) } continue; + case O(ASSEMBLE,AutoHomeHost): + auto_update_home = 1; + continue; + case O(INCREMENTAL, 'e'): case O(CREATE,'e'): case O(ASSEMBLE,'e'): case O(MISC,'e'): /* set metadata (superblock) information */ @@ -320,7 +349,7 @@ int main(int argc, char *argv[]) fprintf(stderr, Name ": metadata information already given\n"); exit(2); } - for(i=0; !ss && superlist[i]; i++) + for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc(optarg); if (!ss) { @@ -337,6 +366,12 @@ int main(int argc, char *argv[]) writemostly = 1; continue; + case O(MANAGE,'w'): + /* clear write-mostly for following devices */ + writemostly = 2; + continue; + + case O(GROW,'z'): case O(CREATE,'z'): /* size */ if (size >= 0) { @@ -347,7 +382,7 @@ int main(int argc, char *argv[]) if (strcmp(optarg, "max")==0) size = 0; else { - size = strtol(optarg, &c, 10); + size = strtoll(optarg, &c, 10); if (!optarg[0] || *c || size < 4) { fprintf(stderr, Name ": invalid size: %s\n", optarg); @@ -411,23 +446,25 @@ int main(int argc, char *argv[]) break; case 10: - /* 'f' or 'n' followed by a number <= raid_disks */ - if ((optarg[0] != 'n' && optarg[0] != 'f') || + /* 'f', 'o' or 'n' followed by a number <= raid_disks */ + if ((optarg[0] != 'n' && optarg[0] != 'f' && optarg[0] != 'o') || (copies = strtoul(optarg+1, &cp, 10)) < 1 || copies > 200 || *cp) { - fprintf(stderr, Name ": layout for raid10 must be 'nNN' or 'fNN' where NN is a number, not %s\n", optarg); + fprintf(stderr, Name ": layout for raid10 must be 'nNN', 'oNN' or 'fNN' where NN is a number, not %s\n", optarg); exit(2); } if (optarg[0] == 'n') layout = 256 + copies; + else if (optarg[0] == 'o') + layout = 0x10000 + (copies<<8) + 1; else layout = 1 + (copies<<8); break; case -5: /* Faulty * modeNNN */ - + { int ln = strcspn(optarg, "0123456789"); char *m = strdup(optarg); @@ -444,8 +481,8 @@ int main(int argc, char *argv[]) } continue; - case O(CREATE,3): - case O(BUILD,3): /* assume clean */ + case O(CREATE,AssumeClean): + case O(BUILD,AssumeClean): /* assume clean */ assume_clean = 1; continue; @@ -487,40 +524,15 @@ int main(int argc, char *argv[]) case O(CREATE,'a'): case O(BUILD,'a'): + case O(INCREMENTAL,'a'): case O(ASSEMBLE,'a'): /* auto-creation of device node */ - if (optarg == NULL) - autof = -2; - else if (strcasecmp(optarg,"no")==0) - autof = 0; - else if (strcasecmp(optarg,"yes")==0) - autof = -2; - else if (strcasecmp(optarg,"md")==0) - autof = -1; - else { - /* There might be digits, and maybe a hypen, at the end */ - char *e = optarg + strlen(optarg); - int num = 4; - int len; - while (e > optarg && isdigit(e[-1])) - e--; - if (*e) { - num = atoi(e); - if (num <= 0) num = 1; - } - if (e > optarg && e[-1] == '-') - e--; - len = e - optarg; - if ((len == 3 && strncasecmp(optarg,"mdp",3)==0) || - (len == 1 && strncasecmp(optarg,"p",1)==0) || - (len >= 4 && strncasecmp(optarg,"part",4)==0)) - autof = num; - else { - fprintf(stderr, Name ": --auto flag arg of \"%s\" unrecognised: use no,yes,md,mdp,part\n" - " optionally followed by a number.\n", - optarg); - exit(2); - } - } + autof = parse_auto(optarg, "--auto flag", 0); + continue; + + case O(CREATE,Symlinks): + case O(BUILD,Symlinks): + case O(ASSEMBLE,Symlinks): /* auto creation of symlinks in /dev to /dev/md */ + symlinks = optarg; continue; case O(BUILD,'f'): /* force honouring '-n 1' */ @@ -532,6 +544,7 @@ int main(int argc, char *argv[]) continue; /* now for the Assemble options */ + case O(CREATE,'u'): /* uuid of array */ case O(ASSEMBLE,'u'): /* uuid of array */ if (ident.uuid_set) { fprintf(stderr, Name ": uuid cannot be set twice. " @@ -585,7 +598,7 @@ int main(int argc, char *argv[]) exit(2); } update = optarg; - if (strcmp(update, "sparc2.2")==0) + if (strcmp(update, "sparc2.2")==0) continue; if (strcmp(update, "super-minor") == 0) continue; @@ -593,12 +606,20 @@ int main(int argc, char *argv[]) continue; if (strcmp(update, "resync")==0) continue; + if (strcmp(update, "uuid")==0) + continue; + if (strcmp(update, "name")==0) + continue; + if (strcmp(update, "homehost")==0) + continue; + if (strcmp(update, "devicesize")==0) + continue; if (strcmp(update, "byteorder")==0) { if (ss) { fprintf(stderr, Name ": must not set metadata type with --update=byteorder.\n"); exit(2); } - for(i=0; !ss && superlist[i]; i++) + for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc("0.swap"); if (!ss) { fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n"); @@ -607,10 +628,28 @@ int main(int argc, char *argv[]) continue; } - fprintf(stderr, Name ": '--update %s' invalid. Only 'sparc2.2', 'super-minor', 'resync' or 'summaries' supported\n",update); - exit(2); + if (strcmp(update,"?") == 0 || + strcmp(update, "help") == 0) { + outf = stdout; + fprintf(outf, Name ": "); + } else { + outf = stderr; + fprintf(outf, + Name ": '--update=%s' is invalid. ", + update); + } + fprintf(outf, "Valid --update options are:\n" + " 'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n" + " 'summaries', 'homehost', 'byteorder', 'devicesize'.\n"); + exit(outf == stdout ? 0 : 2); + + case O(ASSEMBLE,NoDegraded): /* --no-degraded */ + runstop = -1; /* --stop isn't allowed for --assemble, + * so we overload slightly */ + continue; case O(ASSEMBLE,'c'): /* config file */ + case O(INCREMENTAL, 'c'): case O(MISC, 'c'): case O(MONITOR,'c'): if (configfile) { @@ -619,11 +658,13 @@ int main(int argc, char *argv[]) exit(2); } configfile = optarg; + set_conffile(configfile); /* FIXME possibly check that config file exists. Even parse it */ continue; case O(ASSEMBLE,'s'): /* scan */ case O(MISC,'s'): case O(MONITOR,'s'): + case O(INCREMENTAL,'s'): scan = 1; continue; @@ -676,7 +717,7 @@ int main(int argc, char *argv[]) test = 1; continue; case O(MONITOR,'y'): /* log messages to syslog */ - openlog("mdadm", 0, SYSLOG_FACILITY); + openlog("mdadm", LOG_PID, SYSLOG_FACILITY); dosyslog = 1; continue; @@ -688,7 +729,7 @@ int main(int argc, char *argv[]) devmode = 'a'; re_add = 0; continue; - case O(MANAGE,6): + case O(MANAGE,ReAdd): devmode = 'a'; re_add = 1; continue; @@ -698,6 +739,7 @@ int main(int argc, char *argv[]) case O(MANAGE,'f'): /* set faulty */ devmode = 'f'; continue; + case O(INCREMENTAL,'R'): case O(MANAGE,'R'): case O(ASSEMBLE,'R'): case O(BUILD,'R'): @@ -716,21 +758,6 @@ int main(int argc, char *argv[]) runstop = -1; continue; - case O(MANAGE,'o'): - if (readonly < 0) { - fprintf(stderr, Name ": Cannot have both readonly and readwrite\n"); - exit(2); - } - readonly = 1; - continue; - case O(MANAGE,'w'): - if (readonly > 0) { - fprintf(stderr, Name ": Cannot have both readwrite and readonly.\n"); - exit(2); - } - readonly = -1; - continue; - case O(MISC,'Q'): case O(MISC,'D'): case O(MISC,'E'): @@ -740,6 +767,8 @@ int main(int argc, char *argv[]) case O(MISC,'X'): case O(MISC,'o'): case O(MISC,'w'): + case O(MISC,'W'): + case O(MISC, Waitclean): if (devmode && devmode != opt && (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) { fprintf(stderr, Name ": --examine/-E cannot be given with -%c\n", @@ -752,7 +781,7 @@ int main(int argc, char *argv[]) test = 1; continue; - case O(MISC, 22): + case O(MISC, Sparc22): if (devmode != 'E') { fprintf(stderr, Name ": --sparc2.2 only allowed with --examine\n"); exit(2); @@ -777,15 +806,40 @@ int main(int argc, char *argv[]) ident.bitmap_fd = bitmap_fd; /* for Assemble */ continue; - case O(GROW,'b'): + case O(ASSEMBLE, BackupFile): + case O(GROW, BackupFile): + /* Specify a file into which grow might place a backup, + * or from which assemble might recover a backup + */ + if (backup_file) { + fprintf(stderr, Name ": backup file already specified, rejecting %s\n", optarg); + exit(2); + } + backup_file = optarg; + continue; + case O(BUILD,'b'): case O(CREATE,'b'): /* here we create the bitmap */ - bitmap_file = optarg; - continue; + if (strcmp(optarg, "none") == 0) { + fprintf(stderr, Name ": '--bitmap none' only" + " support for --grow\n"); + exit(2); + } + /* FALL THROUGH */ + case O(GROW,'b'): + if (strcmp(optarg, "internal")== 0 || + strcmp(optarg, "none")== 0 || + strchr(optarg, '/') != NULL) { + bitmap_file = optarg; + continue; + } + /* probable typo */ + fprintf(stderr, Name ": bitmap file must contain a '/', or be 'internal', or 'none'\n"); + exit(2); - case O(GROW,4): - case O(BUILD,4): - case O(CREATE,4): /* bitmap chunksize */ + case O(GROW,BitmapChunk): + case O(BUILD,BitmapChunk): + case O(CREATE,BitmapChunk): /* bitmap chunksize */ bitmap_chunk = strtol(optarg, &c, 10); if (!optarg[0] || *c || bitmap_chunk < 0 || bitmap_chunk & (bitmap_chunk - 1)) { @@ -797,8 +851,9 @@ int main(int argc, char *argv[]) bitmap_chunk = bitmap_chunk ? bitmap_chunk * 1024 : 512; continue; - case O(BUILD, 5): - case O(CREATE, 5): /* write-behind mode */ + case O(GROW, WriteBehind): + case O(BUILD, WriteBehind): + case O(CREATE, WriteBehind): /* write-behind mode */ write_behind = DEFAULT_MAX_WRITE_BEHIND; if (optarg) { write_behind = strtol(optarg, &c, 10); @@ -809,16 +864,44 @@ int main(int argc, char *argv[]) } } continue; + + case O(INCREMENTAL, 'r'): + rebuild_map = 1; + continue; } /* We have now processed all the valid options. Anything else is * an error */ - fprintf(stderr, Name ": option %c not valid in %s mode\n", - opt, map_num(modes, mode)); + if (option_index > 0) + fprintf(stderr, Name ":option --%s not valid in %s mode\n", + long_options[option_index].name, + map_num(modes, mode)); + else + fprintf(stderr, Name ": option -%c not valid in %s mode\n", + opt, map_num(modes, mode)); exit(2); } + if (print_help) { + char *help_text = Help; + if (print_help == 2) + help_text = OptionHelp; + else + switch (mode) { + case ASSEMBLE : help_text = Help_assemble; break; + case BUILD : help_text = Help_build; break; + case CREATE : help_text = Help_create; break; + case MANAGE : help_text = Help_manage; break; + case MISC : help_text = Help_misc; break; + case MONITOR : help_text = Help_monitor; break; + case GROW : help_text = Help_grow; break; + case INCREMENTAL:help_text= Help_incr; break; + } + fputs(help_text,stdout); + exit(0); + } + if (!mode && devs_found) { mode = MISC; devmode = 'Q'; @@ -829,6 +912,19 @@ int main(int argc, char *argv[]) fputs(Usage, stderr); exit(2); } + + if (symlinks) { + struct createinfo *ci = conf_get_create_info(); + + if (strcasecmp(symlinks, "yes") == 0) + ci->symlinks = 1; + else if (strcasecmp(symlinks, "no") == 0) + ci->symlinks = 0; + else { + fprintf(stderr, Name ": option --symlinks must be 'no' or 'yes'\n"); + exit(2); + } + } /* Ok, got the option parsing out of the way * hopefully it's mostly right but there might be some stuff * missing @@ -846,17 +942,39 @@ int main(int argc, char *argv[]) exit(2); } if ((int)ident.super_minor == -2 && autof) { - fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n"); + fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n"); exit(2); } - mdfd = open_mddev(devlist->devname, autof); - if (mdfd < 0) + if (mode == MANAGE || mode == GROW) { + mdfd = open_mddev(devlist->devname, 1); + if (mdfd < 0) + exit(1); + } else + /* non-existent device is OK */ + mdfd = open_mddev(devlist->devname, 0); + if (mdfd == -2) { + fprintf(stderr, Name ": device %s exists but is not an " + "md array.\n", devlist->devname); exit(1); + } if ((int)ident.super_minor == -2) { struct stat stb; + if (mdfd < 0) { + fprintf(stderr, Name ": --super-minor=dev given, and " + "listed device %s doesn't exist.\n", + devlist->devname); + exit(1); + } fstat(mdfd, &stb); ident.super_minor = minor(stb.st_rdev); } + if (mdfd >= 0 && mode != MANAGE && mode != GROW) { + /* We don't really want this open yet, we just might + * have wanted to check some things + */ + close(mdfd); + mdfd = -1; + } } if (raiddisks) { @@ -880,6 +998,17 @@ int main(int argc, char *argv[]) } } + if (homehost == NULL) + homehost = conf_get_homehost(); + if (homehost == NULL || strcmp(homehost, "")==0) { + if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) { + sys_hostname[sizeof(sys_hostname)-1] = 0; + homehost = sys_hostname; + } + } + + ident.autof = autof; + rv = 0; switch(mode) { case MANAGE: @@ -892,91 +1021,147 @@ 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, 0); + rv = Manage_runstop(devlist->devname, mdfd, runstop, quiet); break; case ASSEMBLE: if (devs_found == 1 && ident.uuid_set == 0 && ident.super_minor == UnSet && ident.name[0] == 0 && !scan ) { /* Only a device has been given, so get details from config file */ - mddev_ident_t array_ident = conf_get_ident(configfile, devlist->devname); + mddev_ident_t array_ident = conf_get_ident(devlist->devname); if (array_ident == NULL) { fprintf(stderr, Name ": %s not identified in config file.\n", devlist->devname); rv |= 1; - } else { - mdfd = open_mddev(devlist->devname, - array_ident->autof ? array_ident->autof : autof); - if (mdfd < 0) - rv |= 1; - else { - rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile, - NULL, - readonly, runstop, update, verbose-quiet, force); + if (mdfd >= 0) close(mdfd); - } + } else { + if (array_ident->autof == 0) + array_ident->autof = autof; + rv |= Assemble(ss, devlist->devname, array_ident, + NULL, backup_file, + readonly, runstop, update, homehost, verbose-quiet, force); } } else if (!scan) - rv = Assemble(ss, devlist->devname, mdfd, &ident, configfile, - devlist->next, - readonly, runstop, update, verbose-quiet, force); + rv = Assemble(ss, devlist->devname, &ident, + devlist->next, backup_file, + readonly, runstop, update, homehost, verbose-quiet, force); else if (devs_found>0) { if (update && devs_found > 1) { fprintf(stderr, Name ": can only update a single array at a time\n"); exit(1); } + if (backup_file && devs_found > 1) { + fprintf(stderr, Name ": can only assemble a single array when providing a backup file.\n"); + exit(1); + } for (dv = devlist ; dv ; dv=dv->next) { - mddev_ident_t array_ident = conf_get_ident(configfile, dv->devname); + mddev_ident_t array_ident = conf_get_ident(dv->devname); if (array_ident == NULL) { fprintf(stderr, Name ": %s not identified in config file.\n", dv->devname); rv |= 1; continue; } - mdfd = open_mddev(dv->devname, - array_ident->autof ?array_ident->autof : autof); - if (mdfd < 0) { - rv |= 1; - continue; - } - rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile, - NULL, - readonly, runstop, update, verbose-quiet, force); - close(mdfd); + if (array_ident->autof == 0) + array_ident->autof = autof; + rv |= Assemble(ss, dv->devname, array_ident, + NULL, backup_file, + readonly, runstop, update, homehost, verbose-quiet, force); } } else { - mddev_ident_t array_list = conf_get_ident(configfile, NULL); - if (!array_list) { + mddev_ident_t array_list = conf_get_ident(NULL); + mddev_dev_t devlist = conf_get_devs(); + int cnt = 0; + if (devlist == NULL) { + fprintf(stderr, Name ": No devices listed in conf file were found.\n"); + exit(1); + } + if (update) { + fprintf(stderr, Name ": --update not meaningful with a --scan assembly.\n"); + exit(1); + } + if (backup_file) { + fprintf(stderr, Name ": --backup_file not meaningful with a --scan assembly.\n"); + exit(1); + } + for (; array_list; array_list = array_list->next) { + if (array_list->autof == 0) + array_list->autof = autof; + + rv |= Assemble(ss, array_list->devname, + array_list, + NULL, NULL, + readonly, runstop, NULL, homehost, verbose-quiet, force); + if (rv == 0) cnt++; + } + if (homehost) { + /* Maybe we can auto-assemble something. + * Repeatedly call Assemble in auto-assemble mode + * until it fails + */ + int rv2; + int acnt; + ident.autof = autof; + do { + mddev_dev_t devlist = conf_get_devs(); + acnt = 0; + do { + rv2 = Assemble(ss, NULL, + &ident, + devlist, NULL, + readonly, runstop, NULL, homehost, verbose-quiet, force); + if (rv2==0) { + cnt++; + acnt++; + } + if (rv2 == 1) + /* found something so even though assembly failed we + * want to avoid auto-updates + */ + auto_update_home = 0; + } while (rv2!=2); + /* Incase there are stacked devices, we need to go around again */ + } while (acnt); + if (cnt == 0 && auto_update_home && homehost) { + /* Nothing found, maybe we need to bootstrap homehost info */ + do { + acnt = 0; + do { + rv2 = Assemble(ss, NULL, + &ident, + NULL, NULL, + readonly, runstop, "homehost", homehost, verbose-quiet, force); + if (rv2==0) { + cnt++; + acnt++; + } + } while (rv2!=2); + /* Incase there are stacked devices, we need to go around again */ + } while (acnt); + } + if (cnt == 0 && rv == 0) { + fprintf(stderr, Name ": No arrays found in config file or automatically\n"); + rv = 1; + } else if (cnt) + rv = 0; + } else if (cnt == 0 && rv == 0) { fprintf(stderr, Name ": No arrays found in config file\n"); rv = 1; - } else - for (; array_list; array_list = array_list->next) { - mdu_array_info_t array; - mdfd = open_mddev(array_list->devname, - array_list->autof ? array_list->autof : autof); - if (mdfd < 0) { - rv |= 1; - continue; - } - if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0) - /* already assembled, skip */ - ; - else - rv |= Assemble(ss, array_list->devname, mdfd, - array_list, configfile, - NULL, - readonly, runstop, NULL, verbose-quiet, force); - close(mdfd); - } + } } break; case BUILD: - if (bitmap_chunk == UnSet) bitmap_chunk = DEFAULT_BITMAP_CHUNK; if (delay == 0) delay = DEFAULT_BITMAP_DELAY; if (write_behind && !bitmap_file) { fprintf(stderr, Name ": write-behind mode requires a bitmap.\n"); rv = 1; break; } + if (raiddisks == 0) { + fprintf(stderr, Name ": no raid-devices specified.\n"); + rv = 1; + break; + } if (bitmap_file) { if (strcmp(bitmap_file, "internal")==0) { @@ -985,9 +1170,10 @@ int main(int argc, char *argv[]) break; } } - rv = Build(devlist->devname, mdfd, chunk, level, layout, + rv = Build(devlist->devname, chunk, level, layout, raiddisks, devlist->next, assume_clean, - bitmap_file, bitmap_chunk, write_behind, delay, verbose-quiet); + bitmap_file, bitmap_chunk, write_behind, + delay, verbose-quiet, autof); break; case CREATE: if (delay == 0) delay = DEFAULT_BITMAP_DELAY; @@ -996,39 +1182,40 @@ int main(int argc, char *argv[]) rv = 1; break; } - if (ss == NULL) { - for(i=0; !ss && superlist[i]; i++) - ss = superlist[i]->match_metadata_desc("default"); - } - if (!ss) { - fprintf(stderr, Name ": internal error - no default metadata style\n"); - exit(2); + if (raiddisks == 0) { + fprintf(stderr, Name ": no raid-devices specified.\n"); + rv = 1; + break; } - rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size, - raiddisks, sparedisks, ident.name, + rv = Create(ss, devlist->devname, chunk, level, layout, size<0 ? 0 : size, + raiddisks, sparedisks, ident.name, homehost, + ident.uuid_set ? ident.uuid : NULL, devs_found-1, devlist->next, runstop, verbose-quiet, force, assume_clean, - bitmap_file, bitmap_chunk, write_behind, delay); + bitmap_file, bitmap_chunk, write_behind, delay, autof); break; case MISC: - if (devmode == 'E') { if (devlist == NULL && !scan) { fprintf(stderr, Name ": No devices to examine\n"); exit(2); } if (devlist == NULL) - devlist = conf_get_devs(configfile); + devlist = conf_get_devs(); if (devlist == NULL) { fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile); exit(1); } - rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss); + if (brief && verbose) + brief = 2; + rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, + export, scan, + SparcAdjust, ss, homehost); } else { if (devlist == NULL) { if (devmode=='D' && scan) { /* apply --detail to all devices in /proc/mdstat */ - struct mdstat_ent *ms = mdstat_read(0); + struct mdstat_ent *ms = mdstat_read(0, 1); struct mdstat_ent *e; for (e=ms ; e ; e=e->next) { char *name = get_md_name(e->devnum); @@ -1038,7 +1225,8 @@ int main(int argc, char *argv[]) e->dev); continue; } - rv |= Detail(name, verbose>1?0:verbose+1, test); + rv |= Detail(name, verbose>1?0:verbose+1, + export, test, homehost); put_md_name(name); } } else if (devmode == 'S' && scan) { @@ -1049,7 +1237,7 @@ int main(int argc, char *argv[]) int progress=1, err; int last = 0; do { - struct mdstat_ent *ms = mdstat_read(0); + struct mdstat_ent *ms = mdstat_read(0, 0); struct mdstat_ent *e; if (!progress) last = 1; @@ -1062,9 +1250,9 @@ int main(int argc, char *argv[]) e->dev); continue; } - mdfd = open_mddev(name, 0); + mdfd = open_mddev(name, 1); if (mdfd >= 0) { - if (Manage_runstop(name, mdfd, -1, !last)) + if (Manage_runstop(name, mdfd, -1, quiet?1:last?0:-1)) err = 1; else progress = 1; @@ -1083,21 +1271,29 @@ int main(int argc, char *argv[]) for (dv=devlist ; dv; dv=dv->next) { switch(dv->disposition) { case 'D': - rv |= Detail(dv->devname, brief?1+verbose:0, test); continue; + rv |= Detail(dv->devname, + brief?1+verbose:0, + export, test, homehost); + continue; case 'K': /* Zero superblock */ - rv |= Kill(dv->devname, force); continue; + rv |= Kill(dv->devname, force, quiet,0); + continue; case 'Q': rv |= Query(dv->devname); continue; case 'X': rv |= ExamineBitmap(dv->devname, brief, ss); continue; + case 'W': + rv |= Wait(dv->devname); continue; + case Waitclean: + rv |= WaitClean(dv->devname, verbose-quiet); continue; } - mdfd = open_mddev(dv->devname, 0); + mdfd = open_mddev(dv->devname, 1); if (mdfd>=0) { switch(dv->disposition) { case 'R': - rv |= Manage_runstop(dv->devname, mdfd, 1, 0); break; + rv |= Manage_runstop(dv->devname, mdfd, 1, quiet); break; case 'S': - rv |= Manage_runstop(dv->devname, mdfd, -1, 0); break; + rv |= Manage_runstop(dv->devname, mdfd, -1, quiet); break; case 'o': rv |= Manage_ro(dv->devname, mdfd, 1); break; case 'w': @@ -1122,12 +1318,12 @@ int main(int argc, char *argv[]) } rv= Monitor(devlist, mailaddr, program, delay?delay:60, daemonise, scan, oneshot, - dosyslog, configfile, test, pidfile); + dosyslog, test, pidfile); break; case GROW: if (devs_found > 1) { - + /* must be '-a'. */ if (size >= 0 || raiddisks) { fprintf(stderr, Name ": --size, --raiddisks, and --add are exclusing in --grow mode\n"); @@ -1146,14 +1342,47 @@ int main(int argc, char *argv[]) } else if (layout != UnSet) rv = Manage_reconfig(devlist->devname, mdfd, layout); else if (size >= 0 || raiddisks) - rv = Manage_resize(devlist->devname, mdfd, size, raiddisks); + rv = Grow_reshape(devlist->devname, mdfd, quiet, backup_file, + size, level, layout, chunk, raiddisks); else if (bitmap_file) { if (delay == 0) delay = DEFAULT_BITMAP_DELAY; rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file, - bitmap_chunk, delay, write_behind); + bitmap_chunk, delay, write_behind, force); } else fprintf(stderr, Name ": no changes to --grow\n"); break; + case INCREMENTAL: + if (rebuild_map) { + RebuildMap(); + } + if (scan) { + if (runstop <= 0) { + fprintf(stderr, Name + ": --incremental --scan meaningless without --run.\n"); + break; + } + rv = IncrementalScan(verbose); + } + if (!devlist) { + if (!rebuild_map && !scan) { + fprintf(stderr, Name + ": --incremental requires a device.\n"); + rv = 1; + } + break; + } + if (devlist->next) { + fprintf(stderr, Name + ": --incremental can only handle one device.\n"); + rv = 1; + break; + } + rv = Incremental(devlist->devname, verbose-quiet, runstop, + ss, homehost, autof); + break; + case AUTODETECT: + autodetect(); + break; } exit(rv); }