Whamcloud - gitweb
LU-4961 lustre: remove liblustre.h and obd.h from userspace
[fs/lustre-release.git] / lustre / utils / lustre_cfg.c
index 5b4c0ec..6c8355d 100644 (file)
 #include <ctype.h>
 #include <glob.h>
 
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
-#include <lustre_lib.h>
+#include <libcfs/libcfs.h>
 #include <lustre_cfg.h>
 #include <lustre/lustre_idl.h>
-#include <lustre_dlm.h>
-#include <obd.h>          /* for struct lov_stripe_md */
-#include <obd_lov.h>
 #include <lustre/lustre_build_version.h>
 
 #include <unistd.h>
@@ -139,19 +133,6 @@ int jt_lcfg_attach(int argc, char **argv)
         if (rc < 0) {
                 fprintf(stderr, "error: %s: LCFG_ATTACH %s\n",
                         jt_cmdname(argv[0]), strerror(rc = errno));
-        } else if (argc == 3) {
-                char name[1024];
-
-                lcfg_set_devname(argv[2]);
-                if (strlen(argv[2]) > 128) {
-                        printf("Name too long to set environment\n");
-                        return -EINVAL;
-                }
-                snprintf(name, 512, "LUSTRE_DEV_%s", argv[2]);
-                rc = setenv(name, argv[1], 1);
-                if (rc) {
-                        printf("error setting env variable %s\n", name);
-                }
         } else {
                 lcfg_set_devname(argv[2]);
         }
@@ -320,11 +301,6 @@ int jt_lcfg_add_uuid(int argc, char **argv)
         return do_add_uuid(argv[0], argv[1], nid);
 }
 
-int obd_add_uuid(char *uuid, lnet_nid_t nid)
-{
-        return do_add_uuid("obd_add_uuid", uuid, nid);
-}
-
 int jt_lcfg_del_uuid(int argc, char **argv)
 {
         int rc;
@@ -503,6 +479,83 @@ int jt_lcfg_param(int argc, char **argv)
         return rc;
 }
 
+struct param_opts {
+       unsigned int po_only_path:1;
+       unsigned int po_show_path:1;
+       unsigned int po_show_type:1;
+       unsigned int po_recursive:1;
+       unsigned int po_params2:1;
+       unsigned int po_delete:1;
+};
+
+/* Param set to single log file, used by all clients and servers.
+ * This should be loaded after the individual config logs.
+ * Called from set param with -P option.
+ */
+static int jt_lcfg_mgsparam2(int argc, char **argv, struct param_opts *popt)
+{
+       int     rc, i;
+       int     first_param;
+       struct  lustre_cfg_bufs bufs;
+       struct  lustre_cfg *lcfg;
+       char    *buf = NULL;
+       int     len;
+
+       first_param = optind;
+       if (first_param < 0 || first_param >= argc)
+               return CMD_HELP;
+
+       for (i = first_param, rc = 0; i < argc; i++) {
+               lustre_cfg_bufs_reset(&bufs, NULL);
+               /* This same command would be executed on all nodes, many
+                * of which should fail (silently) because they don't have
+                * that proc file existing locally. There would be no
+                * preprocessing on the MGS to try to figure out which
+                * parameter files to add this to, there would be nodes
+                * processing on the cluster nodes to try to figure out
+                * if they are the intended targets. They will blindly
+                * try to set the parameter, and ENOTFOUND means it wasn't
+                * for them.
+                * Target name "general" means call on all targets. It is
+                * left here in case some filtering will be added in
+                * future.
+                */
+               lustre_cfg_bufs_set_string(&bufs, 0, "general");
+
+               len = strlen(argv[i]);
+
+               /* put an '=' on the end in case it doesn't have one */
+               if (popt->po_delete && argv[i][len - 1] != '=') {
+                       buf = malloc(len + 1);
+                       sprintf(buf, "%s=", argv[i]);
+               } else {
+                       buf = argv[i];
+               }
+               lustre_cfg_bufs_set_string(&bufs, 1, buf);
+
+               lcfg = lustre_cfg_new(LCFG_SET_PARAM, &bufs);
+               if (IS_ERR(lcfg)) {
+                       fprintf(stderr, "error: allocating lcfg for %s: %s\n",
+                               jt_cmdname(argv[0]), strerror(PTR_ERR(lcfg)));
+                       if (rc == 0)
+                                rc = PTR_ERR(lcfg);
+               } else {
+                       int rc2 = lcfg_mgs_ioctl(argv[0], OBD_DEV_ID, lcfg);
+                       if (rc2 != 0) {
+                               fprintf(stderr, "error: executing %s: %s\n",
+                                       jt_cmdname(argv[0]), strerror(errno));
+                               if (rc == 0)
+                                       rc = rc2;
+                       }
+                       lustre_cfg_free(lcfg);
+               }
+               if (buf != argv[i])
+                       free(buf);
+       }
+
+       return rc;
+}
+
 /* Param set in config log on MGS */
 /* conf_param key=value */
 /* Note we can actually send mgc conf_params from clients, but currently
@@ -512,11 +565,16 @@ int jt_lcfg_param(int argc, char **argv)
  * AT NEXT REBOOT, not immediately. */
 int jt_lcfg_mgsparam(int argc, char **argv)
 {
-        int rc;
-        int del = 0;
-        struct lustre_cfg_bufs bufs;
-        struct lustre_cfg *lcfg;
-        char *buf = NULL;
+       int rc;
+       int del = 0;
+       struct lustre_cfg_bufs bufs;
+       struct lustre_cfg *lcfg;
+       char *buf = NULL;
+
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 7, 53, 0)
+       fprintf(stderr, "warning: 'lctl conf_param' is deprecated, "
+               "use 'lctl set_param -P' instead\n");
+#endif
 
         /* mgs_setparam processes only lctl buf #1 */
         if ((argc > 3) || (argc <= 1))
@@ -565,12 +623,12 @@ int jt_lcfg_mgsparam(int argc, char **argv)
 
 /* Display the path in the same format as sysctl
  * For eg. obdfilter.lustre-OST0000.stats */
-static char *display_name(char *filename, int show_type)
+static char *display_name(char *filename, unsigned int po_show_type)
 {
         char *tmp;
         struct stat st;
 
-        if (show_type) {
+        if (po_show_type) {
                 if (lstat(filename, &st) < 0)
                         return NULL;
         }
@@ -592,7 +650,7 @@ static char *display_name(char *filename, int show_type)
                 *tmp = '.';
 
         /* append the indicator to entries */
-        if (show_type) {
+        if (po_show_type) {
                 if (S_ISDIR(st.st_mode))
                         strcat(filename, "/");
                 else if (S_ISLNK(st.st_mode))
@@ -683,29 +741,22 @@ static void lprocfs_param_pattern(const char *cmd, const char *path, char *buf,
         }
 }
 
-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;
+        popt->po_show_path = 1;
+        popt->po_only_path = 1;
+        popt->po_show_type = 0;
+        popt->po_recursive = 0;
 
         while ((ch = getopt(argc, argv, "FR")) != -1) {
                 switch (ch) {
                 case 'F':
-                        popt->show_type = 1;
+                        popt->po_show_type = 1;
                         break;
                 case 'R':
-                        popt->recursive = 1;
+                        popt->po_recursive = 1;
                         break;
                 default:
                         return -1;
@@ -722,7 +773,7 @@ static int listparam_display(struct param_opts *popt, char *pattern)
         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),
+        rc = glob(pattern, GLOB_BRACE | (popt->po_recursive ? GLOB_MARK : 0),
                   NULL, &glob_info);
         if (rc) {
                 fprintf(stderr, "error: list_param: %s: %s\n",
@@ -743,7 +794,7 @@ static int listparam_display(struct param_opts *popt, char *pattern)
                 else
                         last = 0;
                 strcpy(filename, glob_info.gl_pathv[i]);
-                valuename = display_name(filename, popt->show_type);
+                valuename = display_name(filename, popt->po_show_type);
                 if (valuename)
                         printf("%s\n", valuename);
                 if (last) {
@@ -765,7 +816,7 @@ int jt_lcfg_listparam(int argc, char **argv)
         char *path;
 
         rc = listparam_cmdline(argc, argv, &popt);
-        if (rc == argc && popt.recursive) {
+        if (rc == argc && popt.po_recursive) {
                 rc--;           /* we know at least "-R" is a parameter */
                 argv[rc] = "*";
         } else if (rc < 0 || rc >= argc) {
@@ -791,20 +842,20 @@ 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;
+        popt->po_show_path = 1;
+        popt->po_only_path = 0;
+        popt->po_show_type = 0;
+        popt->po_recursive = 0;
 
         while ((ch = getopt(argc, argv, "nNF")) != -1) {
                 switch (ch) {
                 case 'N':
-                        popt->only_path = 1;
+                        popt->po_only_path = 1;
                         break;
                 case 'n':
-                        popt->show_path = 0;
+                        popt->po_show_path = 0;
                 case 'F':
-                        popt->show_type = 1;
+                        popt->po_show_type = 1;
                         break;
                 default:
                         return -1;
@@ -837,8 +888,14 @@ static int getparam_display(struct param_opts *popt, char *pattern)
                memset(buf, 0, PAGE_CACHE_SIZE);
                 /* 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]);
+                if (popt->po_show_path) {
+                       if (strlen(glob_info.gl_pathv[i]) >
+                           sizeof(filename)-1) {
+                               free(buf);
+                               return -E2BIG;
+                       }
+                       strncpy(filename, glob_info.gl_pathv[i],
+                               sizeof(filename));
                         valuename = display_name(filename, 0);
                 }
 
@@ -864,7 +921,7 @@ static int getparam_display(struct param_opts *popt, char *pattern)
                         /* 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 && popt->show_path) {
+                        if (valuename && popt->po_show_path) {
                                 int longbuf = strnchr(buf, rc - 1, '\n') != NULL
                                               || rc > 60;
                                 printf("%s=%s", valuename, longbuf ? "\n" : buf);
@@ -909,7 +966,7 @@ int jt_lcfg_getparam(int argc, char **argv)
 
                lprocfs_param_pattern(argv[0], path, pattern, sizeof(pattern));
 
-               if (popt.only_path)
+               if (popt.po_only_path)
                        rc2 = listparam_display(&popt, pattern);
                else
                        rc2 = getparam_display(&popt, pattern);
@@ -924,16 +981,24 @@ 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;
+        popt->po_show_path = 1;
+        popt->po_only_path = 0;
+        popt->po_show_type = 0;
+        popt->po_recursive = 0;
+       popt->po_params2 = 0;
+       popt->po_delete = 0;
 
-        while ((ch = getopt(argc, argv, "n")) != -1) {
+       while ((ch = getopt(argc, argv, "nPd")) != -1) {
                 switch (ch) {
                 case 'n':
-                        popt->show_path = 0;
+                        popt->po_show_path = 0;
                         break;
+               case 'P':
+                       popt->po_params2 = 1;
+                       break;
+               case 'd':
+                       popt->po_delete = 1;
+                       break;
                 default:
                         return -1;
                 }
@@ -958,15 +1023,18 @@ static int setparam_display(struct param_opts *popt, char *pattern, char *value)
        for (i = 0; i  < glob_info.gl_pathc; i++) {
                char *valuename = NULL;
 
-               if (popt->show_path) {
-                       strcpy(filename, glob_info.gl_pathv[i]);
+               if (popt->po_show_path) {
+                       if (strlen(glob_info.gl_pathv[i]) > sizeof(filename)-1)
+                               return -E2BIG;
+                       strncpy(filename, glob_info.gl_pathv[i],
+                               sizeof(filename));
                        valuename = display_name(filename, 0);
                        if (valuename)
                                printf("%s=%s\n", valuename, value);
                }
                /* Write the new value to the file */
                fd = open(glob_info.gl_pathv[i], O_WRONLY);
-               if (fd > 0) {
+               if (fd >= 0) {
                        rc = write(fd, value, strlen(value));
                        if (rc < 0)
                                fprintf(stderr, "error: set_param: setting "
@@ -996,6 +1064,11 @@ int jt_lcfg_setparam(int argc, char **argv)
         if (rc < 0 || rc >= argc)
                 return CMD_HELP;
 
+       if (popt.po_params2)
+               /* We can't delete parameters that were
+                * set with old conf_param interface */
+               return jt_lcfg_mgsparam2(argc, argv, &popt);
+
        for (i = rc, rc = 0; i < argc; i++) {
                int rc2;
 
@@ -1004,6 +1077,8 @@ int jt_lcfg_setparam(int argc, char **argv)
                         *value = '\0';
                         value ++;
                         path = argv[i];
+                       if (*value == '\0')
+                               break;
                 } else {
                         /* format: set_param a b */
                         if (path == NULL) {
@@ -1024,6 +1099,9 @@ int jt_lcfg_setparam(int argc, char **argv)
                if (rc2 < 0 && rc == 0)
                        rc = rc2;
        }
+       if (path != NULL && (value == NULL || *value == '\0'))
+               fprintf(stderr, "error: %s: setting %s=: %s\n",
+                       jt_cmdname(argv[0]), path, strerror(rc = EINVAL));
 
        return rc;
 }