* Sydney, 2052
* Australia
*
- * Additions for bitmap and async RAID options, Copyright (C) 2003-2004,
+ * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004,
* Paul Clements, SteelEye Technology, Inc.
*/
char devmode = 0;
int runstop = 0;
int readonly = 0;
+ int write_behind = 0;
int bitmap_fd = -1;
char *bitmap_file = NULL;
int bitmap_chunk = UnSet;
mddev_dev_t dv;
int devs_found = 0;
int verbose = 0;
+ int quiet = 0;
int brief = 0;
int force = 0;
int test = 0;
char *pidfile = NULL;
int oneshot = 0;
struct supertype *ss = NULL;
+ int writemostly = 0;
+ int re_add = 0;
int copies;
ident.autof = 0;
ident.st = NULL;
ident.bitmap_fd = -1;
+ ident.name[0] = 0;
while ((option_index = -1) ,
(opt=getopt_long(argc, argv,
short_options, long_options,
&option_index)) != -1) {
int newmode = mode;
- /* firstly, so mode-independant options */
+ /* firstly, some mode-independant options */
switch(opt) {
case 'h':
help_text = Help;
case 'v': verbose++;
continue;
+ case 'q': quiet++;
+ continue;
+
case 'b':
if (mode == ASSEMBLE || mode == BUILD || mode == CREATE || mode == GROW)
break; /* b means bitmap */
case 'a':
case 'r':
case 'f':
+ case 6: /* re-add */
if (!mode) newmode = MANAGE;
break;
}
dv->devname = optarg;
dv->disposition = devmode;
+ dv->writemostly = writemostly;
+ dv->re_add = re_add;
dv->next = NULL;
*devlistend = dv;
devlistend = &dv->next;
}
dv->devname = optarg;
dv->disposition = devmode;
+ dv->writemostly = writemostly;
+ dv->re_add = re_add;
dv->next = NULL;
*devlistend = dv;
devlistend = &dv->next;
max_disks = ss->max_devs;
continue;
+ case O(MANAGE,'W'):
+ case O(BUILD,'W'):
+ case O(CREATE,'W'):
+ /* set write-mostly for following devices */
+ writemostly = 1;
+ continue;
+
case O(GROW,'z'):
case O(CREATE,'z'): /* size */
if (size >= 0) {
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 */
}
continue;
+ case O(CREATE,'N'):
+ case O(ASSEMBLE,'N'):
+ if (ident.name[0]) {
+ fprintf(stderr, Name ": name cannot be set twice. "
+ "Second value %s.\n", optarg);
+ exit(2);
+ }
+ if (strlen(optarg) > 32) {
+ fprintf(stderr, Name ": name '%s' is too long, 32 chars max.\n",
+ optarg);
+ exit(2);
+ }
+ strcpy(ident.name, optarg);
+ continue;
+
case O(ASSEMBLE,'m'): /* super-minor for array */
if (ident.super_minor != UnSet) {
fprintf(stderr, Name ": super-minor cannot be set twice. "
continue;
if (strcmp(update, "resync")==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++)
+ ss = superlist[i]->match_metadata_desc("0.swap");
+ if (!ss) {
+ fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n");
+ exit(2);
+ }
+
+ continue;
+ }
fprintf(stderr, Name ": '--update %s' invalid. Only 'sparc2.2', 'super-minor', 'resync' or 'summaries' supported\n",update);
exit(2);
case O(GROW,'a'):
case O(MANAGE,'a'): /* add a drive */
devmode = 'a';
+ re_add = 0;
+ continue;
+ case O(MANAGE,6):
+ devmode = 'a';
+ re_add = 1;
continue;
case O(MANAGE,'r'): /* remove a drive */
devmode = 'r';
/* convert K to B, chunk of 0K means 512B */
bitmap_chunk = bitmap_chunk ? bitmap_chunk * 1024 : 512;
continue;
+
+ case O(BUILD, 5):
+ case O(CREATE, 5): /* write-behind mode */
+ write_behind = DEFAULT_MAX_WRITE_BEHIND;
+ if (optarg) {
+ write_behind = strtol(optarg, &c, 10);
+ if (write_behind < 0 || *c ||
+ write_behind > 16383) {
+ fprintf(stderr, Name ": Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n", optarg);
+ exit(2);
+ }
+ }
+ continue;
}
/* We have now processed all the valid options. Anything else is
* an error
rv = Manage_ro(devlist->devname, mdfd, readonly);
if (!rv && devs_found>1)
rv = Manage_subdevs(devlist->devname, mdfd,
- devlist->next);
+ devlist->next, verbose-quiet);
if (!rv && readonly < 0)
rv = Manage_ro(devlist->devname, mdfd, readonly);
if (!rv && runstop)
break;
case ASSEMBLE:
if (devs_found == 1 && ident.uuid_set == 0 &&
- ident.super_minor == UnSet && !scan ) {
+ 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);
if (array_ident == NULL) {
else {
rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile,
NULL,
- readonly, runstop, update, verbose, force);
+ readonly, runstop, update, verbose-quiet, force);
close(mdfd);
}
}
} else if (!scan)
rv = Assemble(ss, devlist->devname, mdfd, &ident, configfile,
devlist->next,
- readonly, runstop, update, verbose, force);
+ readonly, runstop, update, 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");
}
rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile,
NULL,
- readonly, runstop, update, verbose, force);
+ readonly, runstop, update, verbose-quiet, force);
close(mdfd);
}
} else {
rv |= Assemble(ss, array_list->devname, mdfd,
array_list, configfile,
NULL,
- readonly, runstop, NULL, verbose, force);
+ readonly, runstop, NULL, verbose-quiet, force);
close(mdfd);
}
}
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 (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);
+ bitmap_file, bitmap_chunk, write_behind, delay, verbose-quiet);
break;
case CREATE:
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 (ss == NULL) {
for(i=0; !ss && superlist[i]; i++)
ss = superlist[i]->match_metadata_desc("default");
}
rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
- raiddisks, sparedisks,
- devs_found-1, devlist->next, runstop, verbose, force,
- bitmap_file, bitmap_chunk, delay);
+ raiddisks, sparedisks, ident.name,
+ devs_found-1, devlist->next, runstop, verbose-quiet, force,
+ bitmap_file, bitmap_chunk, write_behind, delay);
break;
case MISC:
put_md_name(name);
}
} while (!last && err);
+ if (err) rv |= 1;
} else {
fprintf(stderr, Name ": No devices given.\n");
exit(2);
rv |= Manage_ro(dv->devname, mdfd, -1); break;
}
close(mdfd);
- }
+ } else
+ rv |= 1;
}
}
break;
else if (bitmap_file) {
if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,
- bitmap_chunk, delay);
+ bitmap_chunk, delay, write_behind);
} else
fprintf(stderr, Name ": no changes to --grow\n");
break;
projects / thirdparty / mdadm.git / blobdiff