Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-3950 lfsck: control LFSCK on all devices via single command
[fs/lustre-release.git]
/
lustre
/
utils
/
lustre_lfsck.c
diff --git
a/lustre/utils/lustre_lfsck.c
b/lustre/utils/lustre_lfsck.c
index
8e2572e
..
0dd7018
100644
(file)
--- a/
lustre/utils/lustre_lfsck.c
+++ b/
lustre/utils/lustre_lfsck.c
@@
-52,12
+52,15
@@
static struct option long_opt_start[] = {
{"dryrun", required_argument, 0, 'n'},
{"reset", no_argument, 0, 'r'},
{"speed", required_argument, 0, 's'},
+ {"all", no_argument, 0, 'A'},
{"type", required_argument, 0, 't'},
+ {"windows", required_argument, 0, 'w'},
{0, 0, 0, 0}
};
static struct option long_opt_stop[] = {
{"device", required_argument, 0, 'M'},
+ {"all", no_argument, 0, 'A'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
@@
-70,7
+73,6
@@
struct lfsck_type_name {
static struct lfsck_type_name lfsck_types_names[] = {
{ "layout", 6, LT_LAYOUT },
- { "DNE", 3, LT_DNE },
{ "namespace", 9, LT_NAMESPACE},
{ 0, 0, 0 }
};
@@
-92,20
+94,23
@@
static void usage_start(void)
{
fprintf(stderr, "Start LFSCK.\n"
"SYNOPSIS:\n"
- "lfsck_start <-M | --device
MDT
_device>\n"
+ "lfsck_start <-M | --device
[MDT,OST]
_device>\n"
" [-e | --error error_handle] [-h | --help]\n"
" [-n | --dryrun switch] [-r | --reset]\n"
- " [-s | --speed speed_limit]\n"
+ " [-s | --speed speed_limit]
[-A | --all]
\n"
" [-t | --type lfsck_type[,lfsck_type...]]\n"
+ " [-w | --windows win_size]\n"
"OPTIONS:\n"
- "-M: The
MDT device to start LFSCK
on.\n"
+ "-M: The
device to start LFSCK/scrub
on.\n"
"-e: Error handle, 'continue'(default) or 'abort'.\n"
"-h: Help information.\n"
"-n: Check without modification. 'off'(default) or 'on'.\n"
"-r: Reset scanning start position to the device beginning.\n"
"-s: How many items can be scanned at most per second. "
"'%d' means no limit (default).\n"
- "-t: The LFSCK type(s) to be started.\n",
+ "-A: Start LFSCK on all MDT devices.\n"
+ "-t: The LFSCK type(s) to be started.\n"
+ "-w: The windows size for async requests pipeline.\n",
LFSCK_SPEED_NO_LIMIT);
}
@@
-113,9
+118,11
@@
static void usage_stop(void)
{
fprintf(stderr, "Stop LFSCK.\n"
"SYNOPSIS:\n"
- "lfsck_stop <-M | --device MDT_device> [-h | --help]\n"
+ "lfsck_stop <-M | --device [MDT,OST]_device>\n"
+ "[-A | --all] [-h | --help]\n"
"OPTIONS:\n"
- "-M: The MDT device to stop LFSCK on.\n"
+ "-M: The device to stop LFSCK/scrub on.\n"
+ "-A: Stop LFSCK on all MDT devices.\n"
"-h: Help information.\n");
}
@@
-124,7
+131,7
@@
static int lfsck_pack_dev(struct obd_ioctl_data *data, char *device, char *arg)
int len = strlen(arg) + 1;
if (len > MAX_OBD_NAME) {
- fprintf(stderr, "
MDT
device name is too long. "
+ fprintf(stderr, "device name is too long. "
"Valid length should be less than %d\n", MAX_OBD_NAME);
return -EINVAL;
}
@@
-142,7
+149,7
@@
int jt_lfsck_start(int argc, char **argv)
char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
char device[MAX_OBD_NAME];
struct lfsck_start start;
- char *optstring = "M:e:hn:rs:
t
:";
+ char *optstring = "M:e:hn:rs:
At:w
:";
int opt, index, rc, val, i, type;
memset(&data, 0, sizeof(data));
@@
-195,6
+202,9
@@
int jt_lfsck_start(int argc, char **argv)
start.ls_speed_limit = val;
start.ls_valid |= LSV_SPEED_LIMIT;
break;
+ case 'A':
+ start.ls_flags |= LPF_ALL_MDT | LPF_BROADCAST;
+ break;
case 't': {
char *str = optarg, *p, c;
@@
-216,8
+226,8
@@
int jt_lfsck_start(int argc, char **argv)
if (type == 0) {
fprintf(stderr, "Invalid type (%s).\n"
"The valid value should be "
- "'layout'
, 'DNE' or "
-
"'namespace'.\n",
str);
+ "'layout'
or 'namespace'.\n",
+ str);
*p = c;
return -EINVAL;
}
@@
-230,11
+240,28
@@
int jt_lfsck_start(int argc, char **argv)
if (start.ls_active == 0) {
fprintf(stderr, "Miss LFSCK type(s).\n"
"The valid value should be "
- "'layout'
, 'DNE'
or 'namespace'.\n");
+ "'layout' or 'namespace'.\n");
return -EINVAL;
}
break;
}
+ case 'w':
+ val = atoi(optarg);
+ if (val < 0 || val > LFSCK_ASYNC_WIN_MAX) {
+ fprintf(stderr,
+ "Too large async windows size, "
+ "which may cause memory issues. "
+ "The valid range is [0 - %u]. "
+ "If you do not want to restrict "
+ "the windows size for async reqeusts "
+ "pipeline, just set it as 0.\n",
+ LFSCK_ASYNC_WIN_MAX);
+ return -EINVAL;
+ }
+
+ start.ls_async_windows = val;
+ start.ls_valid |= LSV_ASYNC_WINDOWS;
+ break;
default:
fprintf(stderr, "Invalid option, '-h' for help.\n");
return -EINVAL;
@@
-242,9
+269,15
@@
int jt_lfsck_start(int argc, char **argv)
}
if (data.ioc_inlbuf4 == NULL) {
- fprintf(stderr,
- "Must sepcify MDT device to start LFSCK.\n");
- return -EINVAL;
+ if (lcfg_get_devname() != NULL) {
+ rc = lfsck_pack_dev(&data, device, lcfg_get_devname());
+ if (rc != 0)
+ return rc;
+ } else {
+ fprintf(stderr,
+ "Must specify device to start LFSCK.\n");
+ return -EINVAL;
+ }
}
data.ioc_inlbuf1 = (char *)&start;
@@
-264,9
+297,9
@@
int jt_lfsck_start(int argc, char **argv)
obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
if (start.ls_active == 0) {
- printf("Started LFSCK on the
MDT
device %s", device);
+ printf("Started LFSCK on the device %s", device);
} else {
- printf("Started LFSCK on the
MDT
device %s:", device);
+ printf("Started LFSCK on the device %s:", device);
i = 0;
while (lfsck_types_names[i].name != NULL) {
if (start.ls_active & lfsck_types_names[i].type) {
@@
-287,10
+320,12
@@
int jt_lfsck_stop(int argc, char **argv)
struct obd_ioctl_data data;
char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
char device[MAX_OBD_NAME];
- char *optstring = "M:h";
+ struct lfsck_stop stop;
+ char *optstring = "M:Ah";
int opt, index, rc;
memset(&data, 0, sizeof(data));
+ memset(&stop, 0, sizeof(stop));
memset(device, 0, MAX_OBD_NAME);
/* Reset the 'optind' for the case of getopt_long() called multiple
@@
-304,6
+339,9
@@
int jt_lfsck_stop(int argc, char **argv)
if (rc != 0)
return rc;
break;
+ case 'A':
+ stop.ls_flags |= LPF_ALL_MDT | LPF_BROADCAST;
+ break;
case 'h':
usage_stop();
return 0;
@@
-314,11
+352,19
@@
int jt_lfsck_stop(int argc, char **argv)
}
if (data.ioc_inlbuf4 == NULL) {
- fprintf(stderr,
- "Must sepcify MDT device to stop LFSCK.\n");
- return -EINVAL;
+ if (lcfg_get_devname() != NULL) {
+ rc = lfsck_pack_dev(&data, device, lcfg_get_devname());
+ if (rc != 0)
+ return rc;
+ } else {
+ fprintf(stderr,
+ "Must specify device to stop LFSCK.\n");
+ return -EINVAL;
+ }
}
+ data.ioc_inlbuf1 = (char *)&stop;
+ data.ioc_inllen1 = sizeof(stop);
memset(buf, 0, sizeof(rawbuf));
rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
if (rc) {
@@
-332,6
+378,6
@@
int jt_lfsck_stop(int argc, char **argv)
return rc;
}
- printf("Stopped LFSCK on the
MDT
device %s.\n", device);
+ printf("Stopped LFSCK on the device %s.\n", device);
return 0;
}