diff options
Diffstat (limited to 'mdadm.c')
-rw-r--r-- | mdadm.c | 225 |
1 files changed, 144 insertions, 81 deletions
@@ -38,6 +38,7 @@ static int misc_list(struct mddev_dev *devlist, struct mddev_ident *ident, char *dump_directory, struct supertype *ss, struct context *c); +const char Name[] = "mdadm"; int main(int argc, char *argv[]) { @@ -73,6 +74,7 @@ int main(int argc, char *argv[]) .require_homehost = 1, }; struct shape s = { + .journaldisks = 0, .level = UnSet, .layout = UnSet, .bitmap_chunk = UnSet, @@ -188,6 +190,7 @@ int main(int argc, char *argv[]) case 'a': case Add: case AddSpare: + case AddJournal: case 'r': case Remove: case Replace: @@ -195,6 +198,7 @@ int main(int argc, char *argv[]) case 'f': case Fail: case ReAdd: /* re-add */ + case ClusterConfirm: if (!mode) { newmode = MANAGE; shortopt = short_bitmap_options; @@ -336,13 +340,11 @@ int main(int argc, char *argv[]) } if (devs_found > 0 && mode == MANAGE && !devmode) { - pr_err("Must give one of -a/-r/-f" - " for subsequent devices at %s\n", optarg); + pr_err("Must give one of -a/-r/-f for subsequent devices at %s\n", optarg); exit(2); } if (devs_found > 0 && mode == GROW && !devmode) { - pr_err("Must give -a/--add for" - " devices to add: %s\n", optarg); + pr_err("Must give -a/--add for devices to add: %s\n", optarg); exit(2); } dv = xmalloc(sizeof(*dv)); @@ -369,8 +371,7 @@ int main(int argc, char *argv[]) case O(BUILD,'c'): /* chunk or rounding */ case O(BUILD,ChunkSize): /* chunk or rounding */ if (s.chunk) { - pr_err("chunk/rounding may only be specified once. " - "Second value is %s.\n", optarg); + pr_err("chunk/rounding may only be specified once. Second value is %s.\n", optarg); exit(2); } s.chunk = parse_size(optarg); @@ -420,8 +421,7 @@ int main(int argc, char *argv[]) case O(CREATE,'z'): case O(BUILD,'z'): /* size */ if (s.size > 0) { - pr_err("size may only be specified once. " - "Second value is %s.\n", optarg); + pr_err("size may only be specified once. Second value is %s.\n", optarg); exit(2); } if (strcmp(optarg, "max")==0) @@ -441,8 +441,7 @@ int main(int argc, char *argv[]) case O(GROW,'Z'): /* array size */ if (array_size > 0) { - pr_err("array-size may only be specified once. " - "Second value is %s.\n", optarg); + pr_err("array-size may only be specified once. Second value is %s.\n", optarg); exit(2); } if (strcmp(optarg, "max") == 0) @@ -461,8 +460,7 @@ int main(int argc, char *argv[]) case O(CREATE,DataOffset): case O(GROW,DataOffset): if (data_offset != INVALID_SECTORS) { - pr_err("data-offset may only be specified one. " - "Second value is %s.\n", optarg); + pr_err("data-offset may only be specified one. Second value is %s.\n", optarg); exit(2); } if (mode == CREATE && @@ -481,8 +479,7 @@ int main(int argc, char *argv[]) case O(CREATE,'l'): case O(BUILD,'l'): /* set raid level*/ if (s.level != UnSet) { - pr_err("raid level may only be set once. " - "Second value is %s.\n", optarg); + pr_err("raid level may only be set once. Second value is %s.\n", optarg); exit(2); } s.level = map_name(pers, optarg); @@ -510,8 +507,7 @@ int main(int argc, char *argv[]) case O(GROW, 'p'): /* new layout */ case O(GROW, Layout): if (s.layout_str) { - pr_err("layout may only be sent once. " - "Second value was %s\n", optarg); + pr_err("layout may only be sent once. Second value was %s\n", optarg); exit(2); } s.layout_str = optarg; @@ -523,8 +519,7 @@ int main(int argc, char *argv[]) case O(BUILD,'p'): /* faulty layout */ case O(BUILD,Layout): if (s.layout != UnSet) { - pr_err("layout may only be sent once. " - "Second value was %s\n", optarg); + pr_err("layout may only be sent once. Second value was %s\n", optarg); exit(2); } switch(s.level) { @@ -596,7 +591,23 @@ int main(int argc, char *argv[]) } ident.raid_disks = s.raiddisks; continue; - + case O(ASSEMBLE, Nodes): + case O(CREATE, Nodes): + c.nodes = parse_num(optarg); + if (c.nodes <= 0) { + pr_err("invalid number for the number of cluster nodes: %s\n", + optarg); + exit(2); + } + continue; + case O(CREATE, ClusterName): + case O(ASSEMBLE, ClusterName): + c.homecluster = optarg; + if (strlen(c.homecluster) > 64) { + pr_err("Cluster name too big.\n"); + exit(ERANGE); + } + continue; case O(CREATE,'x'): /* number of spare (eXtra) disks */ if (s.sparedisks) { pr_err("spare-devices set twice: %d and %s\n", @@ -655,8 +666,7 @@ int main(int argc, char *argv[]) case O(CREATE,'u'): /* uuid of array */ case O(ASSEMBLE,'u'): /* uuid of array */ if (ident.uuid_set) { - pr_err("uuid cannot be set twice. " - "Second value %s.\n", optarg); + pr_err("uuid cannot be set twice. Second value %s.\n", optarg); exit(2); } if (parse_uuid(optarg, ident.uuid)) @@ -671,8 +681,7 @@ int main(int argc, char *argv[]) case O(ASSEMBLE,'N'): case O(MISC,'N'): if (ident.name[0]) { - pr_err("name cannot be set twice. " - "Second value %s.\n", optarg); + pr_err("name cannot be set twice. Second value %s.\n", optarg); exit(2); } if (mode == MISC && !c.subarray) { @@ -690,8 +699,7 @@ int main(int argc, char *argv[]) case O(ASSEMBLE,'m'): /* super-minor for array */ case O(ASSEMBLE,SuperMinor): if (ident.super_minor != UnSet) { - pr_err("super-minor cannot be set twice. " - "Second value: %s.\n", optarg); + pr_err("super-minor cannot be set twice. Second value: %s.\n", optarg); exit(2); } if (strcmp(optarg, "dev")==0) @@ -714,14 +722,12 @@ int main(int argc, char *argv[]) case O(ASSEMBLE,'U'): /* update the superblock */ case O(MISC,'U'): if (c.update) { - pr_err("Can only update one aspect" - " of superblock, both %s and %s given.\n", + pr_err("Can only update one aspect of superblock, both %s and %s given.\n", c.update, optarg); exit(2); } if (mode == MISC && !c.subarray) { - pr_err("Only subarrays can be" - " updated in misc mode\n"); + pr_err("Only subarrays can be updated in misc mode\n"); exit(2); } c.update = optarg; @@ -739,6 +745,10 @@ int main(int argc, char *argv[]) continue; if (strcmp(c.update, "homehost")==0) continue; + if (strcmp(c.update, "home-cluster")==0) + continue; + if (strcmp(c.update, "nodes")==0) + continue; if (strcmp(c.update, "devicesize")==0) continue; if (strcmp(c.update, "no-bitmap")==0) @@ -747,22 +757,22 @@ int main(int argc, char *argv[]) continue; if (strcmp(c.update, "no-bbl") == 0) continue; + if (strcmp(c.update, "force-no-bbl") == 0) + continue; if (strcmp(c.update, "metadata") == 0) continue; if (strcmp(c.update, "revert-reshape") == 0) continue; if (strcmp(c.update, "byteorder")==0) { if (ss) { - pr_err("must not set metadata" - " type with --update=byteorder.\n"); + pr_err("must not set metadata type with --update=byteorder.\n"); exit(2); } for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc( "0.swap"); if (!ss) { - pr_err("INTERNAL ERROR" - " cannot find 0.swap\n"); + pr_err("INTERNAL ERROR cannot find 0.swap\n"); exit(2); } @@ -771,38 +781,38 @@ int main(int argc, char *argv[]) if (strcmp(c.update,"?") == 0 || strcmp(c.update, "help") == 0) { outf = stdout; - fprintf(outf, Name ": "); + fprintf(outf, "%s: ", Name); } else { outf = stderr; fprintf(outf, - Name ": '--update=%s' is invalid. ", - c.update); + "%s: '--update=%s' is invalid. ", + Name, c.update); } fprintf(outf, "Valid --update options are:\n" - " 'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n" - " 'summaries', 'homehost', 'byteorder', 'devicesize',\n" - " 'no-bitmap', 'metadata', 'revert-reshape'\n"); + " 'sparc2.2', 'super-minor', 'uuid', 'name', 'nodes', 'resync',\n" + " 'summaries', 'homehost', 'home-cluster', 'byteorder', 'devicesize',\n" + " 'no-bitmap', 'metadata', 'revert-reshape'\n" + " 'bbl', 'no-bbl', 'force-no-bbl'\n" + ); exit(outf == stdout ? 0 : 2); case O(MANAGE,'U'): /* update=devicesize is allowed with --re-add */ if (devmode != 'A') { - pr_err("--update in Manage mode only" - " allowed with --re-add.\n"); + pr_err("--update in Manage mode only allowed with --re-add.\n"); exit(1); } if (c.update) { - pr_err("Can only update one aspect" - " of superblock, both %s and %s given.\n", + pr_err("Can only update one aspect of superblock, both %s and %s given.\n", c.update, optarg); exit(2); } c.update = optarg; if (strcmp(c.update, "devicesize") != 0 && strcmp(c.update, "bbl") != 0 && + strcmp(c.update, "force-no-bbl") != 0 && strcmp(c.update, "no-bbl") != 0) { - pr_err("only 'devicesize', 'bbl' and 'no-bbl' can be" - " updated with --re-add\n"); + pr_err("only 'devicesize', 'bbl', 'no-bbl', and 'force-no-bbl' can be updated with --re-add\n"); exit(2); } continue; @@ -824,8 +834,7 @@ int main(int argc, char *argv[]) case O(MONITOR,ConfigFile): case O(CREATE,ConfigFile): if (configfile) { - pr_err("configfile cannot be set twice. " - "Second value is %s.\n", optarg); + pr_err("configfile cannot be set twice. Second value is %s.\n", optarg); exit(2); } configfile = optarg; @@ -920,6 +929,13 @@ int main(int argc, char *argv[]) case O(MANAGE,AddSpare): /* add drive - never re-add */ devmode = 'S'; continue; + case O(MANAGE,AddJournal): /* add journal */ + if (s.journaldisks && (s.level < 4 || s.level > 6)) { + pr_err("--add-journal is only supported for RAID level 4/5/6.\n"); + exit(2); + } + devmode = 'j'; + continue; case O(MANAGE,ReAdd): devmode = 'A'; continue; @@ -936,6 +952,9 @@ int main(int argc, char *argv[]) * remove the device */ devmode = 'f'; continue; + case O(MANAGE, ClusterConfirm): + devmode = 'c'; + continue; case O(MANAGE,Replace): /* Mark these devices for replacement */ devmode = 'R'; @@ -991,8 +1010,7 @@ int main(int argc, char *argv[]) case O(MISC ,Action): if (opt == KillSubarray || opt == UpdateSubarray) { if (c.subarray) { - pr_err("subarray can only" - " be specified once\n"); + pr_err("subarray can only be specified once\n"); exit(2); } c.subarray = optarg; @@ -1039,12 +1057,10 @@ int main(int argc, char *argv[]) continue; case O(MISC, UdevRules): if (devmode && devmode != opt) { - pr_err("--udev-rules must" - " be the only option.\n"); + pr_err("--udev-rules must be the only option.\n"); } else { if (udev_filename) - pr_err("only specify one udev " - "rule filename. %s ignored.\n", + pr_err("only specify one udev rule filename. %s ignored.\n", optarg); else udev_filename = optarg; @@ -1117,6 +1133,15 @@ int main(int argc, char *argv[]) s.bitmap_file = optarg; continue; } + if (strcmp(optarg, "clustered")== 0) { + s.bitmap_file = optarg; + /* Set the default number of cluster nodes + * to 4 if not already set by user + */ + if (c.nodes < 1) + c.nodes = 4; + continue; + } /* probable typo */ pr_err("bitmap file must contain a '/', or be 'internal', or 'none'\n" " not '%s'\n", optarg); @@ -1157,6 +1182,23 @@ int main(int argc, char *argv[]) case O(INCREMENTAL, IncrementalPath): remove_path = optarg; continue; + case O(CREATE, WriteJournal): + if (s.journaldisks) { + pr_err("Please specify only one journal device for the array.\n"); + pr_err("Ignoring --write-journal %s...\n", optarg); + continue; + } + dv = xmalloc(sizeof(*dv)); + dv->devname = optarg; + dv->disposition = 'j'; /* WriteJournal */ + dv->used = 0; + dv->next = NULL; + *devlistend = dv; + devlistend = &dv->next; + devs_found++; + + s.journaldisks = 1; + continue; } /* We have now processed all the valid options. Anything else is * an error @@ -1184,6 +1226,11 @@ int main(int argc, char *argv[]) exit(0); } + if (s.journaldisks && (s.level < 4 || s.level > 6)) { + pr_err("--write-journal is only supported for RAID level 4/5/6.\n"); + exit(2); + } + if (!mode && devs_found) { mode = MISC; devmode = 'Q'; @@ -1236,15 +1283,13 @@ int main(int argc, char *argv[]) /* non-existent device is OK */ mdfd = open_mddev(devlist->devname, 0); if (mdfd == -2) { - pr_err("device %s exists but is not an " - "md array.\n", devlist->devname); + pr_err("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) { - pr_err("--super-minor=dev given, and " - "listed device %s doesn't exist.\n", + pr_err("--super-minor=dev given, and listed device %s doesn't exist.\n", devlist->devname); exit(1); } @@ -1269,7 +1314,7 @@ int main(int argc, char *argv[]) } } - if (c.homehost == NULL) + if (c.homehost == NULL && c.require_homehost) c.homehost = conf_get_homehost(&c.require_homehost); if (c.homehost == NULL || strcasecmp(c.homehost, "<system>")==0) { if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) { @@ -1282,6 +1327,20 @@ int main(int argc, char *argv[]) c.require_homehost = 0; } + rv = 0; + + set_hooks(); /* set hooks from libs */ + + if (c.homecluster == NULL && (c.nodes > 0)) { + c.homecluster = conf_get_homecluster(); + if (c.homecluster == NULL) + rv = get_cluster_name(&c.homecluster); + if (rv) { + pr_err("The md can't get cluster name\n"); + exit(1); + } + } + if (c.backup_file && data_offset != INVALID_SECTORS) { pr_err("--backup-file and --data-offset are incompatible\n"); exit(2); @@ -1301,7 +1360,6 @@ int main(int argc, char *argv[]) /* --scan implied --brief unless -vv */ c.brief = 1; - rv = 0; switch(mode) { case MANAGE: /* readonly, add/remove, readwrite, runstop */ @@ -1388,8 +1446,9 @@ int main(int argc, char *argv[]) } if (s.bitmap_file) { - if (strcmp(s.bitmap_file, "internal")==0) { - pr_err("'internal' bitmaps not supported with --build\n"); + if (strcmp(s.bitmap_file, "internal")==0 || + strcmp(s.bitmap_file, "clustered") == 0) { + pr_err("'internal' and 'clustered' bitmaps not supported with --build\n"); rv |= 1; break; } @@ -1399,6 +1458,21 @@ int main(int argc, char *argv[]) case CREATE: if (c.delay == 0) c.delay = DEFAULT_BITMAP_DELAY; + + if (c.nodes) { + if (!s.bitmap_file || strcmp(s.bitmap_file, "clustered") != 0) { + pr_err("--nodes argument only compatible with --bitmap=clustered\n"); + rv = 1; + break; + } + + if (s.level != 1) { + pr_err("--bitmap=clustered is currently supported with RAID mirror only\n"); + rv = 1; + break; + } + } + if (s.write_behind && !s.bitmap_file) { pr_err("write-behind mode requires a bitmap.\n"); rv = 1; @@ -1464,8 +1538,6 @@ int main(int argc, char *argv[]) else c.delay = 60; } - if (c.delay == 0) - c.delay = 60; rv= Monitor(devlist, mailaddr, program, &c, daemonise, oneshot, dosyslog, pidfile, increments, @@ -1482,8 +1554,7 @@ int main(int argc, char *argv[]) struct mdinfo sra; int err; if (s.raiddisks || s.level != UnSet) { - pr_err("cannot change array size in same operation " - "as changing raiddisks or level.\n" + pr_err("cannot change array size in same operation as changing raiddisks or level.\n" " Change size first, then check that data is still intact.\n"); rv = 1; break; @@ -1495,11 +1566,9 @@ int main(int argc, char *argv[]) err = sysfs_set_num(&sra, NULL, "array_size", array_size / 2); if (err < 0) { if (errno == E2BIG) - pr_err("--array-size setting" - " is too large.\n"); + pr_err("--array-size setting is too large.\n"); else - pr_err("current kernel does" - " not support setting --array-size\n"); + pr_err("current kernel does not support setting --array-size\n"); rv = 1; break; } @@ -1507,8 +1576,7 @@ int main(int argc, char *argv[]) if (devs_found > 1 && s.raiddisks == 0 && s.level == UnSet) { /* must be '-a'. */ if (s.size > 0 || s.chunk || s.layout_str != NULL || s.bitmap_file) { - pr_err("--add cannot be used with " - "other geometry changes in --grow mode\n"); + pr_err("--add cannot be used with other geometry changes in --grow mode\n"); rv = 1; break; } @@ -1521,9 +1589,7 @@ int main(int argc, char *argv[]) } else if (s.bitmap_file) { if (s.size > 0 || s.raiddisks || s.chunk || s.layout_str != NULL || devs_found > 1) { - pr_err("--bitmap changes cannot be " - "used with other geometry changes " - "in --grow mode\n"); + pr_err("--bitmap changes cannot be used with other geometry changes in --grow mode\n"); rv = 1; break; } @@ -1600,8 +1666,7 @@ static int scan_assemble(struct supertype *ss, int failures, successes; if (conf_verify_devnames(array_list)) { - pr_err("Duplicate MD device names in " - "conf file were found.\n"); + pr_err("Duplicate MD device names in conf file were found.\n"); return 1; } if (devlist == NULL) { @@ -1614,9 +1679,7 @@ static int scan_assemble(struct supertype *ss, a->autof = c->autof; } if (map_lock(&map)) - pr_err("%s: failed to get " - "exclusive lock on mapfile\n", - __func__); + pr_err("failed to get exclusive lock on mapfile\n"); do { failures = 0; successes = 0; @@ -1706,7 +1769,7 @@ static int misc_scan(char devmode, struct context *c) if (!name) { pr_err("cannot find device file for %s\n", - e->dev); + e->devnm); continue; } if (devmode == 'D') @@ -1741,7 +1804,7 @@ static int stop_scan(int verbose) if (!name) { pr_err("cannot find device file for %s\n", - e->dev); + e->devnm); continue; } mdfd = open_mddev(name, 1); |