-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <stdlib.h>
#include <sys/ioctl.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <stdarg.h>
#include <ctype.h>
int lcfg_set_devname(char *name)
{
+ char *ptr;
+ int digit = 1;
+
if (name) {
if (lcfg_devname)
free(lcfg_devname);
/* quietly strip the unnecessary '$' */
if (*name == '$' || *name == '%')
name++;
- if (isdigit(*name)) {
+
+ ptr = name;
+ while (*ptr != '\0') {
+ if (!isdigit(*ptr)) {
+ digit = 0;
+ break;
+ }
+ ptr++;
+ }
+
+ if (digit) {
/* We can't translate from dev # to name */
lcfg_devname = NULL;
} else {
}
} else {
lcfg_devname = NULL;
- }
+ }
return 0;
}
if (lcfg_devname == NULL) {
fprintf(stderr, "%s: please use 'device name' to set the "
- "device name for config commands.\n",
- jt_cmdname(argv[0]));
+ "device name for config commands.\n",
+ jt_cmdname(argv[0]));
return -EINVAL;
}
if (lcfg_devname == NULL) {
fprintf(stderr, "%s: please use 'device name' to set the "
- "device name for config commands.\n",
- jt_cmdname(argv[0]));
+ "device name for config commands.\n",
+ jt_cmdname(argv[0]));
return -EINVAL;
}
if (lcfg_devname == NULL) {
fprintf(stderr, "%s: please use 'device name' to set the "
- "device name for config commands.\n",
- jt_cmdname(argv[0]));
+ "device name for config commands.\n",
+ jt_cmdname(argv[0]));
return -EINVAL;
}
return rc;
}
-static
-int do_add_uuid(char * func, char *uuid, lnet_nid_t nid)
+static
+int do_add_uuid(char * func, char *uuid, lnet_nid_t nid)
{
int rc;
struct lustre_cfg_bufs bufs;
lcfg = lustre_cfg_new(LCFG_ADD_UUID, &bufs);
lcfg->lcfg_nid = nid;
- /* Poison NAL -- pre 1.4.6 will LASSERT on 0 NAL, this way it
+ /* Poison NAL -- pre 1.4.6 will LASSERT on 0 NAL, this way it
doesn't work without crashing (bz 10130) */
lcfg->lcfg_nal = 0x5a;
int jt_lcfg_add_uuid(int argc, char **argv)
{
lnet_nid_t nid;
-
- if (argc != 3) {
+
+ if (argc != 3) {
return CMD_HELP;
}
lustre_cfg_bufs_reset(&bufs, lcfg_devname);
if (strcmp (argv[1], "_all_"))
lustre_cfg_bufs_set_string(&bufs, 1, argv[1]);
-
+
lcfg = lustre_cfg_new(LCFG_DEL_UUID, &bufs);
rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
lustre_cfg_free(lcfg);
return 0;
}
-
-
-
int jt_lcfg_del_mount_option(int argc, char **argv)
{
int rc;
lustre_cfg_bufs_reset(&bufs, lcfg_devname);
lcfg = lustre_cfg_new(LCFG_SET_TIMEOUT, &bufs);
lcfg->lcfg_num = atoi(argv[1]);
-
+
rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
//rc = lcfg_mgs_ioctl(argv[0], OBD_DEV_ID, lcfg);
return rc;
}
-
-
int jt_lcfg_add_conn(int argc, char **argv)
{
struct lustre_cfg_bufs bufs;
if (lcfg_devname == NULL) {
fprintf(stderr, "%s: please use 'device name' to set the "
- "device name for config commands.\n",
- jt_cmdname(argv[0]));
+ "device name for config commands.\n",
+ jt_cmdname(argv[0]));
return -EINVAL;
}
if (lcfg_devname == NULL) {
fprintf(stderr, "%s: please use 'device name' to set the "
- "device name for config commands.\n",
- jt_cmdname(argv[0]));
+ "device name for config commands.\n",
+ jt_cmdname(argv[0]));
return -EINVAL;
}
}
lcfg = lustre_cfg_new(LCFG_PARAM, &bufs);
-
+
rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
lustre_cfg_free(lcfg);
if (rc < 0) {
}
/* Param set in config log on MGS */
-/* conf_param key1=value1 [key2=value2...] */
+/* conf_param key=value */
+/* Note we can actually send mgc conf_params from clients, but currently
+ * that's only done for default file striping (see ll_send_mgc_param),
+ * and not here. */
+/* After removal of a parameter (-d) Lustre will use the default
+ * AT NEXT REBOOT, not immediately. */
int jt_lcfg_mgsparam(int argc, char **argv)
{
- int i, rc;
+ int rc;
+ int del = 0;
struct lustre_cfg_bufs bufs;
struct lustre_cfg *lcfg;
+ char *buf = NULL;
- if ((argc >= LUSTRE_CFG_MAX_BUFCOUNT) || (argc <= 1))
+ /* mgs_setparam processes only lctl buf #1 */
+ if ((argc > 3) || (argc <= 1))
return CMD_HELP;
+ while ((rc = getopt(argc, argv, "d")) != -1) {
+ switch (rc) {
+ case 'd':
+ del = 1;
+ break;
+ default:
+ return CMD_HELP;
+ }
+ }
+
lustre_cfg_bufs_reset(&bufs, NULL);
- for (i = 1; i < argc; i++) {
- lustre_cfg_bufs_set_string(&bufs, i, argv[i]);
+ if (del) {
+ char *ptr;
+
+ /* for delete, make it "<param>=\0" */
+ buf = malloc(strlen(argv[optind]) + 2);
+ /* put an '=' on the end in case it doesn't have one */
+ sprintf(buf, "%s=", argv[optind]);
+ /* then truncate after the first '=' */
+ ptr = strchr(buf, '=');
+ *(++ptr) = '\0';
+ lustre_cfg_bufs_set_string(&bufs, 1, buf);
+ } else {
+ lustre_cfg_bufs_set_string(&bufs, 1, argv[optind]);
}
/* We could put other opcodes here. */
rc = lcfg_mgs_ioctl(argv[0], OBD_DEV_ID, lcfg);
lustre_cfg_free(lcfg);
+ if (buf)
+ free(buf);
if (rc < 0) {
fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
}
-
+
return rc;
}
/* Display the path in the same format as sysctl
* For eg. obdfilter.lustre-OST0000.stats */
-static char *display_name(char *filename)
+static char *display_name(char *filename, int show_type)
{
char *tmp;
+ struct stat st;
+
+ if (show_type) {
+ if (lstat(filename, &st) < 0)
+ return NULL;
+ }
filename += strlen("/proc/");
if (strncmp(filename, "fs/", strlen("fs/")) == 0)
if (strncmp(filename, "lustre/", strlen("lustre/")) == 0)
filename += strlen("lustre/");
+ else if (strncmp(filename, "lnet/", strlen("lnet/")) == 0)
+ filename += strlen("lnet/");
/* replace '/' with '.' to match conf_param and sysctl */
tmp = filename;
while ((tmp = strchr(tmp, '/')) != NULL)
*tmp = '.';
+ /* append the indicator to entries */
+ if (show_type) {
+ if (S_ISDIR(st.st_mode))
+ strcat(filename, "/");
+ else if (S_ISLNK(st.st_mode))
+ strcat(filename, "@");
+ else if (st.st_mode & S_IWUSR)
+ strcat(filename, "=");
+ }
+
return filename;
}
/* Find a character in a length limited string */
+/* BEWARE - kernel definition of strnchr has args in different order! */
static char *strnchr(const char *p, char c, size_t n)
{
if (!p)
return (0);
}
-int jt_lcfg_getparam(int argc, char **argv)
+static char *globerrstr(int glob_rc)
{
- int fp;
- int rc = 0, i, show_path = 0, only_path = 0;
- char pattern[PATH_MAX];
- char *path, *tmp, *buf;
- glob_t glob_info;
-
- if (argc == 3 && (strcmp(argv[1], "-n") == 0 || strcmp(argv[1], "-N") == 0)) {
- path = argv[2];
- if (strcmp(argv[1], "-N") == 0) {
- only_path = 1;
- show_path = 1;
- }
- } else if (argc == 2) {
- show_path = 1;
- path = argv[1];
- } else {
- return CMD_HELP;
+ switch(glob_rc) {
+ case GLOB_NOSPACE:
+ return "Out of memory";
+ case GLOB_ABORTED:
+ return "Read error";
+ case GLOB_NOMATCH:
+ return "Found no match";
}
+ return "Unknown error";
+}
+
+static void clean_path(char *path)
+{
+ char *tmp;
/* If the input is in form Eg. obdfilter.*.stats */
if (strchr(path, '.')) {
tmp = path;
while (*tmp != '\0') {
- if (*tmp == '.')
+ if ((*tmp == '.') &&
+ (tmp != path) && (*(tmp - 1) != '\\'))
*tmp = '/';
tmp ++;
}
}
+ /* get rid of '\', glob doesn't like it */
+ if ((tmp = strrchr(path, '\\')) != NULL) {
+ char *tail = path + strlen(path);
+ while (tmp != path) {
+ if (*tmp == '\\') {
+ memmove(tmp, tmp + 1, tail - tmp);
+ --tail;
+ }
+ --tmp;
+ }
+ }
+}
+
+/* Supporting file paths creates perilous behavoir: LU-888.
+ * Path support is deprecated.
+ * If a path is supplied it must begin with /proc. */
+static void lprocfs_param_pattern(const char *cmd, const char *path, char *buf,
+ size_t buf_size)
+{
+ /* test path to see if it begins with '/proc/' */
+ if (strncmp(path, "/proc/", strlen("/proc/")) == 0) {
+ static int warned;
+ if (!warned) {
+ fprintf(stderr, "%s: specifying parameters via "
+ "full paths is deprecated.\n", cmd);
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2,6,50,0)
+#warning "remove deprecated full path tunable access"
+#endif
+ warned = 1;
+ }
+ snprintf(buf, buf_size, "%s", path);
+ } else {
+ snprintf(buf, buf_size, "/proc/{fs,sys}/{lnet,lustre}/%s",
+ path);
+ }
+}
+
+struct param_opts {
+ int only_path:1;
+ int show_path:1;
+ int show_type:1;
+ int recursive:1;
+};
+
+static int listparam_cmdline(int argc, char **argv, struct param_opts *popt)
+{
+ int ch;
+
+ popt->show_path = 1;
+ popt->only_path = 1;
+ popt->show_type = 0;
+ popt->recursive = 0;
+
+ while ((ch = getopt(argc, argv, "FR")) != -1) {
+ switch (ch) {
+ case 'F':
+ popt->show_type = 1;
+ break;
+ case 'R':
+ popt->recursive = 1;
+ break;
+ default:
+ return -1;
+ }
+ }
+
+ return optind;
+}
+
+static int listparam_display(struct param_opts *popt, char *pattern)
+{
+ int rc;
+ int i;
+ glob_t glob_info;
+ char filename[PATH_MAX + 1]; /* extra 1 byte for file type */
+
+ rc = glob(pattern, GLOB_BRACE | (popt->recursive ? GLOB_MARK : 0),
+ NULL, &glob_info);
+ if (rc) {
+ fprintf(stderr, "error: list_param: %s: %s\n",
+ pattern, globerrstr(rc));
+ return -ESRCH;
+ }
+
+ for (i = 0; i < glob_info.gl_pathc; i++) {
+ char *valuename = NULL;
+ int last;
+
+ /* Trailing '/' will indicate recursion into directory */
+ last = strlen(glob_info.gl_pathv[i]) - 1;
+
+ /* Remove trailing '/' or it will be converted to '.' */
+ if (last > 0 && glob_info.gl_pathv[i][last] == '/')
+ glob_info.gl_pathv[i][last] = '\0';
+ else
+ last = 0;
+ strcpy(filename, glob_info.gl_pathv[i]);
+ valuename = display_name(filename, popt->show_type);
+ if (valuename)
+ printf("%s\n", valuename);
+ if (last) {
+ strcpy(filename, glob_info.gl_pathv[i]);
+ strcat(filename, "/*");
+ listparam_display(popt, filename);
+ }
+ }
+
+ globfree(&glob_info);
+ return rc;
+}
+
+int jt_lcfg_listparam(int argc, char **argv)
+{
+ int rc = 0, i;
+ struct param_opts popt;
+ char pattern[PATH_MAX];
+ char *path;
+
+ rc = listparam_cmdline(argc, argv, &popt);
+ if (rc == argc && popt.recursive) {
+ rc--; /* we know at least "-R" is a parameter */
+ argv[rc] = "*";
+ } else if (rc < 0 || rc >= argc) {
+ return CMD_HELP;
+ }
+
+ for (i = rc; i < argc; i++) {
+ path = argv[i];
+
+ clean_path(path);
- /* If the entire path is specified as input */
- fp = open(path, O_RDONLY);
- if (fp < 0)
- snprintf(pattern, PATH_MAX, "/proc/{fs,sys}/{lnet,lustre}/%s",
- path);
- else {
- strcpy(pattern, path);
- close(fp);
+ lprocfs_param_pattern(argv[0], path, pattern, sizeof(pattern));
+
+ rc = listparam_display(&popt, pattern);
+ if (rc < 0)
+ return rc;
}
+ return 0;
+}
+
+static int getparam_cmdline(int argc, char **argv, struct param_opts *popt)
+{
+ int ch;
+
+ popt->show_path = 1;
+ popt->only_path = 0;
+ popt->show_type = 0;
+ popt->recursive = 0;
+
+ while ((ch = getopt(argc, argv, "nNF")) != -1) {
+ switch (ch) {
+ case 'N':
+ popt->only_path = 1;
+ break;
+ case 'n':
+ popt->show_path = 0;
+ case 'F':
+ popt->show_type = 1;
+ break;
+ default:
+ return -1;
+ }
+ }
+
+ return optind;
+}
+
+static int getparam_display(struct param_opts *popt, char *pattern)
+{
+ int rc;
+ int fd;
+ int i;
+ char *buf;
+ glob_t glob_info;
+ char filename[PATH_MAX + 1]; /* extra 1 byte for file type */
+
rc = glob(pattern, GLOB_BRACE, NULL, &glob_info);
if (rc) {
- fprintf(stderr, "error : glob %s: %s \n", pattern,strerror(rc));
- return rc;
+ fprintf(stderr, "error: get_param: %s: %s\n",
+ pattern, globerrstr(rc));
+ return -ESRCH;
}
buf = malloc(CFS_PAGE_SIZE);
char *valuename = NULL;
memset(buf, 0, CFS_PAGE_SIZE);
- if (show_path) {
- char *filename;
- filename = strdup(glob_info.gl_pathv[i]);
- valuename = display_name(filename);
- if (valuename && only_path) {
- printf("%s\n", valuename);
- continue;
- }
+ /* As listparam_display is used to show param name (with type),
+ * here "if (only_path)" is ignored.*/
+ if (popt->show_path) {
+ strcpy(filename, glob_info.gl_pathv[i]);
+ valuename = display_name(filename, 0);
}
/* Write the contents of file to stdout */
- fp = open(glob_info.gl_pathv[i], O_RDONLY);
- if (fp < 0) {
- fprintf(stderr, "error: %s: opening('%s') failed: %s\n",
- jt_cmdname(argv[0]), glob_info.gl_pathv[i],
- strerror(errno));
+ fd = open(glob_info.gl_pathv[i], O_RDONLY);
+ if (fd < 0) {
+ fprintf(stderr,
+ "error: get_param: opening('%s') failed: %s\n",
+ glob_info.gl_pathv[i], strerror(errno));
continue;
}
do {
- rc = read(fp, buf, CFS_PAGE_SIZE);
+ rc = read(fd, buf, CFS_PAGE_SIZE);
if (rc == 0)
break;
if (rc < 0) {
- fprintf(stderr, "error: %s: read('%s') "
- "failed: %s\n", jt_cmdname(argv[0]),
+ fprintf(stderr, "error: get_param: "
+ "read('%s') failed: %s\n",
glob_info.gl_pathv[i], strerror(errno));
break;
}
/* Print the output in the format path=value if the
* value contains no new line character or cab be
* occupied in a line, else print value on new line */
- if (valuename && show_path) {
+ if (valuename && popt->show_path) {
int longbuf = strnchr(buf, rc - 1, '\n') != NULL
|| rc > 60;
printf("%s=%s", valuename, longbuf ? "\n" : buf);
}
rc = write(fileno(stdout), buf, rc);
if (rc < 0) {
- fprintf(stderr, "error: %s: write to stdout "
- "failed: %s\n", jt_cmdname(argv[0]),
+ fprintf(stderr, "error: get_param: "
+ "write to stdout failed: %s\n",
strerror(errno));
break;
}
} while (1);
- close(fp);
+ close(fd);
}
globfree(&glob_info);
return rc;
}
-
-int jt_lcfg_setparam(int argc, char **argv)
+int jt_lcfg_getparam(int argc, char **argv)
{
int rc = 0, i;
- int fp, show_path = 0;
+ struct param_opts popt;
char pattern[PATH_MAX];
- char *path, *value, *tmp;
- glob_t glob_info;
+ char *path;
- path = argv[1];
- if (argc == 4 && (strcmp(argv[1], "-n") == 0)) {
- /* Format: lctl set_param -n param value */
- path = argv[2];
- value = argv[3];
- } else if (argc == 3) {
- if (strcmp(argv[1], "-n") != 0) {
- /* Format: lctl set_param param value */
- show_path = 1;
- value = argv[2];
- } else if ((value = strchr(argv[2], '=')) != NULL) {
- /* Format: lctl set_param -n param=value */
- path = argv[2];
- *value = '\0';
- value ++;
- } else {
- fprintf(stderr, "error: %s Incorrect arguments."
- "See Usage\n",
- jt_cmdname(argv[0]));
- return CMD_HELP;
- }
- } else if (argc == 2 && ((value = strchr(argv[1], '=')) != NULL)) {
- /* Format: lctl set_param param=value */
- show_path = 1;
- *value = '\0';
- value++;
- } else {
- fprintf(stderr, "error: %s Incorrect arguments. See Usage\n",
- jt_cmdname(argv[0]));
+ rc = getparam_cmdline(argc, argv, &popt);
+ if (rc < 0 || rc >= argc)
return CMD_HELP;
- }
- /* If the input is in form Eg. obdfilter.*.stats */
- if (strchr(path, '.')) {
- tmp = path;
- while (*tmp != '\0') {
- if (*tmp == '.')
- *tmp = '/';
- tmp ++;
+ for (i = rc, rc = 0; i < argc; i++) {
+ int rc2;
+
+ path = argv[i];
+
+ clean_path(path);
+
+ lprocfs_param_pattern(argv[0], path, pattern, sizeof(pattern));
+
+ if (popt.only_path)
+ rc2 = listparam_display(&popt, pattern);
+ else
+ rc2 = getparam_display(&popt, pattern);
+ if (rc2 < 0 && rc == 0)
+ rc = rc2;
+ }
+
+ return rc;
+}
+
+static int setparam_cmdline(int argc, char **argv, struct param_opts *popt)
+{
+ int ch;
+
+ popt->show_path = 1;
+ popt->only_path = 0;
+ popt->show_type = 0;
+ popt->recursive = 0;
+
+ while ((ch = getopt(argc, argv, "n")) != -1) {
+ switch (ch) {
+ case 'n':
+ popt->show_path = 0;
+ break;
+ default:
+ return -1;
}
}
+ return optind;
+}
- fp = open(path, O_RDONLY);
- if (fp < 0)
- snprintf(pattern, PATH_MAX, "/proc/{fs,sys}/{lnet,lustre}/%s",
- path);
- else {
- strcpy(pattern, path);
- close(fp);
- }
+static int setparam_display(struct param_opts *popt, char *pattern, char *value)
+{
+ int rc;
+ int fd;
+ int i;
+ glob_t glob_info;
+ char filename[PATH_MAX + 1]; /* extra 1 byte for file type */
rc = glob(pattern, GLOB_BRACE, NULL, &glob_info);
if (rc) {
- fprintf(stderr, "error : glob %s: %s \n", pattern,strerror(rc));
- return rc;
+ fprintf(stderr, "error: set_param: %s: %s\n",
+ pattern, globerrstr(rc));
+ return -ESRCH;
}
for (i = 0; i < glob_info.gl_pathc; i++) {
- if (show_path) {
- char *valuename, *filename;
- filename = strdup(glob_info.gl_pathv[i]);
- valuename = display_name(filename);
- printf("%s=%s\n", valuename, value);
+ char *valuename = NULL;
+
+ if (popt->show_path) {
+ strcpy(filename, glob_info.gl_pathv[i]);
+ valuename = display_name(filename, 0);
+ if (valuename)
+ printf("%s=%s\n", valuename, value);
}
/* Write the new value to the file */
- fp = open(glob_info.gl_pathv[i], O_WRONLY);
- if (fp > 0) {
- rc = write(fp, value, strlen(value));
+ fd = open(glob_info.gl_pathv[i], O_WRONLY);
+ if (fd > 0) {
+ rc = write(fd, value, strlen(value));
if (rc < 0)
- fprintf(stderr,
- "error writing to file %s\n",
- glob_info.gl_pathv[i]);
+ fprintf(stderr, "error: set_param: "
+ "writing to file %s: %s\n",
+ glob_info.gl_pathv[i], strerror(errno));
else
rc = 0;
- close(fp);
+ close(fd);
} else {
- fprintf(stderr, "error: %s: %s opening %s\n",
- jt_cmdname(argv[0]), strerror(rc = errno),
- glob_info.gl_pathv[i]);
+ fprintf(stderr, "error: set_param: %s opening %s\n",
+ strerror(rc = errno), glob_info.gl_pathv[i]);
}
}
globfree(&glob_info);
return rc;
}
+
+int jt_lcfg_setparam(int argc, char **argv)
+{
+ int rc = 0, i;
+ struct param_opts popt;
+ char pattern[PATH_MAX];
+ char *path = NULL, *value = NULL;
+
+ rc = setparam_cmdline(argc, argv, &popt);
+ if (rc < 0 || rc >= argc)
+ return CMD_HELP;
+
+ for (i = rc, rc = 0; i < argc; i++) {
+ int rc2;
+
+ if ((value = strchr(argv[i], '=')) != NULL) {
+ /* format: set_param a=b */
+ *value = '\0';
+ value ++;
+ path = argv[i];
+ } else {
+ /* format: set_param a b */
+ if (path == NULL) {
+ path = argv[i];
+ continue;
+ } else {
+ value = argv[i];
+ }
+ }
+
+ clean_path(path);
+
+ lprocfs_param_pattern(argv[0], path, pattern, sizeof(pattern));
+
+ rc2 = setparam_display(&popt, pattern, value);
+ path = NULL;
+ value = NULL;
+ if (rc2 < 0 && rc == 0)
+ rc = rc2;
+ }
+
+ return rc;
+}
+
git://git.whamcloud.com / fs / lustre-release.git / blobdiff