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-5700 llite: handle concurrent use of cob_transient_pages
[fs/lustre-release.git]
/
lustre
/
utils
/
lustre_lfsck.c
diff --git
a/lustre/utils/lustre_lfsck.c
b/lustre/utils/lustre_lfsck.c
index
4f04f02
..
ce8263b
100644
(file)
--- a/
lustre/utils/lustre_lfsck.c
+++ b/
lustre/utils/lustre_lfsck.c
@@
-56,7
+56,7
@@
static struct option long_opt_start[] = {
{"reset", no_argument, 0, 'r'},
{"speed", required_argument, 0, 's'},
{"type", required_argument, 0, 't'},
- {"window
s",
required_argument, 0, 'w'},
+ {"window
_size",
required_argument, 0, 'w'},
{0, 0, 0, 0 }
};
@@
-68,68
+68,71
@@
static struct option long_opt_stop[] = {
};
struct lfsck_type_name {
- char *name;
- int namelen;
- enum lfsck_type type;
+ char *ltn_name;
+ enum lfsck_type ltn_type;
};
static struct lfsck_type_name lfsck_types_names[] = {
- { "layout", 6, LT_LAYOUT },
- { "namespace", 9, LT_NAMESPACE},
- { 0, 0, 0 }
+ { "scrub", LFSCK_TYPE_SCRUB },
+ { "layout", LFSCK_TYPE_LAYOUT },
+ { "namespace", LFSCK_TYPE_NAMESPACE },
+ { "default", LFSCK_TYPES_DEF },
+ { "all", LFSCK_TYPES_SUPPORTED },
+ { NULL, 0 }
};
-static
inline int lfsck_name2type(const char *name, int namelen
)
+static
enum lfsck_type lfsck_name2type(const char *name
)
{
- int i
= 0
;
+ int i;
- while (lfsck_types_names[i].name != NULL) {
- if (namelen == lfsck_types_names[i].namelen &&
- strncmp(lfsck_types_names[i].name, name, namelen) == 0)
- return lfsck_types_names[i].type;
- i++;
+ for (i = 0; lfsck_types_names[i].ltn_name != NULL; i++) {
+ if (strcmp(lfsck_types_names[i].ltn_name, name) == 0)
+ return lfsck_types_names[i].ltn_type;
}
- return
0
;
+ return
-1
;
}
static void usage_start(void)
{
- fprintf(stderr, "Start LFSCK.\n"
- "SYNOPSIS:\n"
- "lfsck_start <-M | --device [MDT,OST]_device>\n"
- " [-A | --all] [-c | --create_ostobj [swtich]]\n"
- " [-e | --error error_handle] [-h | --help]\n"
- " [-n | --dryrun [switch]] [-o | --orphan]\n"
- " [-r | --reset] [-s | --speed speed_limit]\n"
- " [-t | --type lfsck_type[,lfsck_type...]]\n"
- " [-w | --windows win_size]\n"
- "OPTIONS:\n"
- "-M: The device to start LFSCK/scrub on.\n"
- "-A: Start LFSCK on all MDT devices.\n"
- "-c: create the lost OST-object for dangling LOV EA. "
- "'off'(default) or 'on'.\n"
- "-e: Error handle, 'continue'(default) or 'abort'.\n"
- "-h: Help information.\n"
- "-n: Check without modification. 'off'(default) or 'on'.\n"
- "-o: handle orphan objects.\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"
- "-w: The windows size for async requests pipeline.\n",
+ fprintf(stderr, "start LFSCK\n"
+ "usage:\n"
+ "lfsck_start <-M | --device {MDT,OST}_device>\n"
+ " [-A | --all] [-c | --create_ostobj [on | off]]\n"
+ " [-C | --create_mdtobj [on | off]]\n"
+ " [-e | --error {continue | abort}] [-h | --help]\n"
+ " [-n | --dryrun [on | off]] [-o | --orphan]\n"
+ " [-r | --reset] [-s | --speed ops_per_sec_limit]\n"
+ " [-t | --type check_type[,check_type...]]\n"
+ " [-w | --window_size size]\n"
+ "options:\n"
+ "-M: device to start LFSCK/scrub on\n"
+ "-A: start LFSCK on all MDT devices\n"
+ "-c: create the lost OST-object for dangling LOV EA "
+ "(default 'off', or 'on')\n"
+ "-C: create the lost MDT-object for dangling name entry "
+ "(default 'off', or 'on')\n"
+ "-e: error handle mode (default 'continue', or 'abort')\n"
+ "-h: this help message\n"
+ "-n: check with no modification (default 'off', or 'on')\n"
+ "-o: repair orphan OST-objects\n"
+ "-r: reset scanning to the start of the device\n"
+ "-s: maximum items to be scanned per second "
+ "(default '%d' = no limit)\n"
+ "-t: check type(s) to be performed (default all)\n"
+ "-w: window size for async requests pipeline\n",
LFSCK_SPEED_NO_LIMIT);
}
static void usage_stop(void)
{
- fprintf(stderr, "
Stop LFSCK.
\n"
- "
SYNOPSIS
:\n"
- "lfsck_stop <-M | --device
[MDT,OST]
_device>\n"
- "[-A | --all] [-h | --help]\n"
- "
OPTIONS
:\n"
- "-M:
The device to stop LFSCK/scrub on.
\n"
- "-A:
Stop LFSCK on all MDT devices.
\n"
- "-h:
Help information.
\n");
+ fprintf(stderr, "
stop LFSCK
\n"
+ "
usage
:\n"
+ "lfsck_stop <-M | --device
{MDT,OST}
_device>\n"
+ "
[-A | --all] [-h | --help]\n"
+ "
options
:\n"
+ "-M:
device to stop LFSCK/scrub on
\n"
+ "-A:
stop LFSCK on all MDT devices
\n"
+ "-h:
this help message
\n");
}
static int lfsck_pack_dev(struct obd_ioctl_data *data, char *device, char *arg)
@@
-155,14
+158,14
@@
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:Ac::e:h
n::ors:t:w:";
- int opt, index, rc, val, i
, type
;
+ char *optstring = "
Ac::C::e:hM:
n::ors:t:w:";
+ int opt, index, rc, val, i;
memset(&data, 0, sizeof(data));
memset(&start, 0, sizeof(start));
memset(device, 0, MAX_OBD_NAME);
start.ls_version = LFSCK_VERSION_V1;
- start.ls_active = LFSCK_TYPES_
DEF
;
+ start.ls_active = LFSCK_TYPES_
ALL
;
/* Reset the 'optind' for the case of getopt_long() called multiple
* times under the same lctl. */
@@
-170,11
+173,6
@@
int jt_lfsck_start(int argc, char **argv)
while ((opt = getopt_long(argc, argv, optstring, long_opt_start,
&index)) != EOF) {
switch (opt) {
- case 'M':
- rc = lfsck_pack_dev(&data, device, optarg);
- if (rc != 0)
- return rc;
- break;
case 'A':
start.ls_flags |= LPF_ALL_TGT | LPF_BROADCAST;
break;
@@
-182,22
+180,35
@@
int jt_lfsck_start(int argc, char **argv)
if (optarg == NULL || strcmp(optarg, "on") == 0) {
start.ls_flags |= LPF_CREATE_OSTOBJ;
} else if (strcmp(optarg, "off") != 0) {
- fprintf(stderr, "
Invalid switch: %s
. "
- "
The valid switch should be: 'on'
"
- "
or 'off' (default) without blank,
"
- "
or empty. For example: '-non' or
"
- "'-
noff' or '-n'.
\n", optarg);
+ fprintf(stderr, "
invalid switch: -c '%s'
. "
+ "
valid switches are:\n
"
+ "
empty ('on'), or 'off' without space.
"
+ "
For example:\n
"
+ "'-
c', '-con', '-coff'
\n", optarg);
return -EINVAL;
}
start.ls_valid |= LSV_CREATE_OSTOBJ;
break;
+ case 'C':
+ if (optarg == NULL || strcmp(optarg, "on") == 0) {
+ start.ls_flags |= LPF_CREATE_MDTOBJ;
+ } else if (strcmp(optarg, "off") != 0) {
+ fprintf(stderr, "invalid switch: -C '%s'. "
+ "valid switches are:\n"
+ "empty ('on'), or 'off' without space. "
+ "For example:\n"
+ "'-C', '-Con', '-Coff'\n", optarg);
+ return -EINVAL;
+ }
+ start.ls_valid |= LSV_CREATE_MDTOBJ;
+ break;
case 'e':
if (strcmp(optarg, "abort") == 0) {
start.ls_flags |= LPF_FAILOUT;
} else if (strcmp(optarg, "continue") != 0) {
- fprintf(stderr, "
Invalid error handler: %s.
"
- "
The valid value should be: 'continue'
"
- "
(default)
or 'abort'.\n", optarg);
+ fprintf(stderr, "
invalid error mode: -e '%s'.
"
+ "
valid modes are:
"
+ "
'continue'
or 'abort'.\n", optarg);
return -EINVAL;
}
start.ls_valid |= LSV_ERROR_HANDLE;
@@
-205,22
+216,27
@@
int jt_lfsck_start(int argc, char **argv)
case 'h':
usage_start();
return 0;
+ case 'M':
+ rc = lfsck_pack_dev(&data, device, optarg);
+ if (rc != 0)
+ return rc;
+ break;
case 'n':
if (optarg == NULL || strcmp(optarg, "on") == 0) {
start.ls_flags |= LPF_DRYRUN;
} else if (strcmp(optarg, "off") != 0) {
- fprintf(stderr, "
Invalid switch: %s
. "
- "
The valid switch should be: 'on'
"
- "
or 'off' (default) without blank,
"
- "
or empty. For example: '-non' or
"
- "'-n
off' or '-n'.
\n", optarg);
+ fprintf(stderr, "
invalid switch: -n '%s'
. "
+ "
valid switches are:\n
"
+ "
empty ('on'), or 'off' without space.
"
+ "
For example:\n
"
+ "'-n
', '-non', '-noff'
\n", optarg);
return -EINVAL;
}
start.ls_valid |= LSV_DRYRUN;
break;
case 'o':
start.ls_flags |= LPF_ALL_TGT | LPF_BROADCAST |
- LPF_ORPHAN;
+ LPF_O
ST_O
RPHAN;
break;
case 'r':
start.ls_flags |= LPF_RESET;
@@
-231,54
+247,37
@@
int jt_lfsck_start(int argc, char **argv)
start.ls_valid |= LSV_SPEED_LIMIT;
break;
case 't': {
- char *str = optarg, *p, c;
-
- start.ls_active = 0;
- while (*str) {
- while (*str == ' ' || *str == ',')
- str++;
-
- if (*str == 0)
- break;
-
- p = str;
- while (*p != 0 && *p != ' ' && *p != ',')
- p++;
-
- c = *p;
- *p = 0;
- type = lfsck_name2type(str, strlen(str));
- if (type == 0) {
- fprintf(stderr, "Invalid type (%s).\n"
- "The valid value should be "
- "'layout' or 'namespace'.\n",
- str);
- *p = c;
- return -EINVAL;
- }
-
- *p = c;
- str = p;
+ char *typename;
+
+ if (start.ls_active == LFSCK_TYPES_ALL)
+ start.ls_active = 0;
+ while ((typename = strsep(&optarg, ",")) != NULL) {
+ enum lfsck_type type;
+ type = lfsck_name2type(typename);
+ if (type == -1)
+ goto bad_type;
start.ls_active |= type;
}
- if (start.ls_active == 0) {
- fprintf(stderr, "Miss LFSCK type(s).\n"
- "The valid value should be "
- "'layout' or 'namespace'.\n");
- return -EINVAL;
- }
break;
+bad_type:
+ fprintf(stderr, "invalid check type -t '%s'. "
+ "valid types are:\n", typename);
+ for (i = 0; lfsck_types_names[i].ltn_name != NULL; i++)
+ fprintf(stderr, "%s%s", i != 0 ? "," : "",
+ lfsck_types_names[i].ltn_name);
+ fprintf(stderr, "\n");
+ return -EINVAL;
}
case 'w':
val = atoi(optarg);
if (val < 0 || val > LFSCK_ASYNC_WIN_MAX) {
fprintf(stderr,
- "Too large async window
s
size, "
+ "Too large async window size, "
"which may cause memory issues. "
"The valid range is [0 - %u]. "
"If you do not want to restrict "
- "the window
s
size for async reqeusts "
+ "the window size for async reqeusts "
"pipeline, just set it as 0.\n",
LFSCK_ASYNC_WIN_MAX);
return -EINVAL;
@@
-293,6
+292,9
@@
int jt_lfsck_start(int argc, char **argv)
}
}
+ if (start.ls_active == LFSCK_TYPES_ALL)
+ start.ls_active = LFSCK_TYPES_DEF;
+
if (data.ioc_inlbuf4 == NULL) {
if (lcfg_get_devname() != NULL) {
rc = lfsck_pack_dev(&data, device, lcfg_get_devname());
@@
-321,22
+323,17
@@
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 device %s", device);
- } else {
- 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) {
- printf(" %s", lfsck_types_names[i].name);
- start.ls_active &= ~lfsck_types_names[i].type;
- }
- i++;
+ printf("Started LFSCK on the device %s: scrub", device);
+ for (i = 0; lfsck_types_names[i].ltn_name != NULL; i++) {
+ if (start.ls_active & lfsck_types_names[i].ltn_type) {
+ printf(" %s", lfsck_types_names[i].ltn_name);
+ start.ls_active &= ~lfsck_types_names[i].ltn_type;
}
- if (start.ls_active != 0)
- printf(" unknown(0x%x)", start.ls_active);
}
- printf(".\n");
+ if (start.ls_active != 0)
+ printf(" unknown(0x%x)", start.ls_active);
+ printf("\n");
+
return 0;
}
@@
-346,7
+343,7
@@
int jt_lfsck_stop(int argc, char **argv)
char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
char device[MAX_OBD_NAME];
struct lfsck_stop stop;
- char *optstring = "
M:Ah
";
+ char *optstring = "
AhM:
";
int opt, index, rc;
memset(&data, 0, sizeof(data));
@@
-359,17
+356,17
@@
int jt_lfsck_stop(int argc, char **argv)
while ((opt = getopt_long(argc, argv, optstring, long_opt_stop,
&index)) != EOF) {
switch (opt) {
- case 'M':
- rc = lfsck_pack_dev(&data, device, optarg);
- if (rc != 0)
- return rc;
- break;
case 'A':
stop.ls_flags |= LPF_ALL_TGT | LPF_BROADCAST;
break;
case 'h':
usage_stop();
return 0;
+ case 'M':
+ rc = lfsck_pack_dev(&data, device, optarg);
+ if (rc != 0)
+ return rc;
+ break;
default:
fprintf(stderr, "Invalid option, '-h' for help.\n");
return -EINVAL;