X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flctl.c;h=5c6892c28c42130b9431bbd66d84fd69a23d2793;hb=281671b5ee43c2aea5d5b708aadf10fd1df45b16;hp=7d01120d660ad878c746a5bcdcf981782a8b2095;hpb=f6b2e7bd8da1fc8cf2ec3a24caa787fbed5f155c;p=fs%2Flustre-release.git

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index 7d01120..5c6892c 100644
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -1,39 +1,51 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: Peter J. Braam <braam@clusterfs.com>
- *   Author: Phil Schwan <phil@clusterfs.com>
- *   Author: Robert Read <rread@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/utils/lctl.c
+ *
+ * Author: Peter J. Braam <braam@clusterfs.com>
+ * Author: Phil Schwan <phil@clusterfs.com>
+ * Author: Robert Read <rread@clusterfs.com>
  */
 
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <errno.h>
-#include <portals/ptlctl.h>
+#include <lnet/lnetctl.h>
 #include "obdctl.h"
-#include "parser.h"
+#include <libcfs/libcfsutil.h>
+#include <lustre/lustre_idl.h>
 
 static int jt_quit(int argc, char **argv) {
         Parser_quit(argc, argv);
@@ -49,495 +61,114 @@ static int jt_opt_ignore_errors(int argc, char **argv) {
         return 0;
 }
 
-#include <linux/lustre_audit.h>
-
-static int parse_audit_ops(char * str, __u64 * mask)
-{
-        char * op = strtok(str, ",");
-        int rc = 0;
-        
-        while (op) {
-                if (!strcmp(op, "all")) {
-                        *mask |= AUDIT_ALL_OPS;
-                        break;
-                }
-                else if (!strcmp(op,"none")) {
-                        *mask &= ~AUDIT_ALL_OPS;
-                }
-                else if (!strcmp(op,"create"))
-                        SET_AUDIT_OP((*mask), AUDIT_CREATE);
-                else if (!strcmp(op,"link"))
-                        SET_AUDIT_OP((*mask), AUDIT_LINK);
-                else if (!strcmp(op,"delete"))
-                        SET_AUDIT_OP((*mask), AUDIT_UNLINK);
-                else if (!strcmp(op,"rename"))
-                        SET_AUDIT_OP((*mask), AUDIT_RENAME);
-                else if (!strcmp(op,"read")) {
-                        SET_AUDIT_OP((*mask), AUDIT_READ);
-                        SET_AUDIT_OP((*mask), AUDIT_MMAP);
-                }
-                else if (!strcmp(op,"write"))
-                        SET_AUDIT_OP((*mask), AUDIT_WRITE);
-                else if (!strcmp(op,"open"))
-                        SET_AUDIT_OP((*mask), AUDIT_OPEN);
-                else if (!strcmp(op,"stat"))
-                        SET_AUDIT_OP((*mask), AUDIT_STAT);
-                else if (!strcmp(op,"readdir"))
-                        SET_AUDIT_OP((*mask), AUDIT_READDIR);
-                else if (!strcmp(op,"readlink"))
-                        SET_AUDIT_OP((*mask), AUDIT_READLINK);
-                else if (!strcmp(op,"setattr"))
-                        SET_AUDIT_OP((*mask), AUDIT_SETATTR);
-                else {
-                        fprintf(stderr, "invalid audit operation '%s'\n", op);
-                }       
-
-                op = strtok(NULL, ",");
-        }
-        
-        return rc;
-}
-
-#include <unistd.h>
-#include <dirent.h>
-#include <linux/unistd.h>
-
-static int set_dir_audit(char * dir, __u64 mask)
-{
-        int rc = 0;
-        char * buf;
-        DIR * sdr;
-        struct dirent * ent = (void*)buf;
-        
-        buf = malloc(strlen(dir) + NAME_MAX + 1);
-        
-        sdr = opendir(dir);
-        if (!sdr) {
-                fprintf(stderr, "cannot open dir %s\n", dir);
-                free(buf);
-                return -1;
-        }
-        
-        while ((ent = readdir(sdr)) != NULL) {
-                int fd;
-                
-                if (!strcmp(ent->d_name, ".") ||
-                    !strcmp(ent->d_name, ".."))
-                        continue;
-                //open file/dir
-                sprintf(buf, "%s/%s\0", dir, ent->d_name);
-                //printf("set audit on %s\n", buf);
-
-                fd = open(buf, O_RDONLY);
-                if (fd < 0) {
-                        fprintf(stderr, "can't open: %s: %s\n", buf,
-                                strerror(rc = errno));
-                        closedir(sdr);
-                        free(buf);
-                        continue;
-                }
-                rc = ioctl(fd, LL_IOC_AUDIT, mask);
-                close(fd);
-        }
-        closedir(sdr);
-        free(buf);
-        return rc;
-}
-
-static int set_audit(int argc, char **argv, int fs)
-{
-        __u64 mask = 0;
-        struct stat st;
-        int rc, fd;
-
-        if (argc != 4)
-                return CMD_HELP;
-        
-        /* audit can be for all operations or for failed only */
-        if (!strcmp(argv[1], "fail"))
-                SET_AUDIT_OP(mask, AUDIT_FAIL);
-        else if (strcmp(argv[1], "all")) {
-                fprintf(stderr, "%s: invalid audit type %s\n",
-                        jt_cmdname(argv[0]), argv[1]);
-                return -EINVAL;
-        }
-        
-        rc = parse_audit_ops(argv[2], &mask);
-        if (rc < 0)
-                return -EINVAL;
-        
-        //open file/dir
-        fd = open(argv[3], O_RDONLY);
-        if (fd < 0) {
-                fprintf(stderr, "can't open: %s: %s\n", argv[3],
-                        strerror(rc = errno));
-                return -1;
-        }
-        
-        rc = fstat(fd, &st);
-        if (rc) {
-                close(fd);
-                return rc;
-        }
-        //audit for fs?
-        if (fs)
-                SET_AUDIT_OP(mask, AUDIT_FS);
-        else {
-                //if dir then set audit for childs also
-                if (S_ISDIR(st.st_mode)) {
-                        rc = set_dir_audit(argv[3], mask);
-                }
-        }
-        //set audit for file/dir itself
-        rc = ioctl(fd, LL_IOC_AUDIT, mask);
-        close(fd);
-        return rc;
-}
-
-static int jt_set_audit(int argc, char **argv)
-{
-        return set_audit(argc, argv, 0);
-}
-
-static int jt_set_fsaudit(int argc, char **argv)
-{
-        return set_audit(argc, argv, 1);
-}
-
-/*
- * XXX Should not belong to here
- */
-static int flush_cred_ioctl(char *mp)
-{
-        int fd, rc;
-
-        fd = open(mp, O_RDONLY);
-        if (fd == -1) {
-                fprintf(stderr, "flush_cred_ioctl: error open %s: %s\n",
-                        mp, strerror(errno));
-                return -1;
-        }
-
-        rc = ioctl(fd, LL_IOC_FLUSH_CRED);
-        if (rc == -1) {
-                fprintf(stderr, "flush_cred_ioctl: error ioctl %s: %s\n",
-                        mp, strerror(errno));
-        }
-
-        close(fd);
-        return rc;
-}
-
-static int jt_flush_cred(int argc, char **argv)
-{
-        FILE   *proc;
-        char    procline[PATH_MAX], *line;
-        int     i, rc = 0;
-
-        /* no args means search all lustre mountpoints */
-        if (argc < 2) {
-                proc = fopen("/proc/mounts", "r");
-                if (!proc) {
-                        fprintf(stderr, "%s: can't open /proc/mounts\n",
-                                jt_cmdname(argv[0]));
-                        return -1;
-                }
-
-                while ((line = fgets(procline, PATH_MAX, proc)) != NULL) {
-                        char dev[PATH_MAX];
-                        char mp[PATH_MAX];
-                        char fs[PATH_MAX];
-
-                        if (sscanf(line, "%s %s %s", dev, mp, fs) != 3) {
-                                fprintf(stderr, "%s: unexpected format in "
-                                                "/proc/mounts\n",
-                                        jt_cmdname(argv[0]));
-                                return -1;
-                        }
-
-                        if (strcmp(fs, "lustre") &&
-                            strcmp(fs, "lustre_lite"))
-                                continue;
-
-                        if (flush_cred_ioctl(mp))
-                                rc = -1;
-                }
-        } else {
-                /* follow the exact flush sequence as supplied */
-                for (i = 1; i < argc; i++) {
-                        if (flush_cred_ioctl(argv[i]))
-                                rc = -1;
-                }
-        }
-
-        return rc;
-}
-
 command_t cmdlist[] = {
         /* Metacommands */
+        {"===== metacommands =======", jt_noop, 0, "metacommands"},
         {"--device", jt_opt_device, 0,
          "run <command> after connecting to device <devno>\n"
          "--device <devno> <command [args ...]>"},
-        {"--threads", jt_opt_threads, 0,
-         "run <threads> separate instances of <command> on device <devno>\n"
-         "--threads <threads> <verbose> <devno> <command [args ...]>"},
         {"--ignore_errors", jt_opt_ignore_errors, 0,
          "ignore errors that occur during script processing\n"
          "--ignore_errors"},
         {"ignore_errors", jt_opt_ignore_errors, 0,
          "ignore errors that occur during script processing\n"
          "ignore_errors"},
-        {"dump", jt_ioc_dump, 0, "usage: dump file, save ioctl buffer to file"},
+
+        /* User interface commands */
+        {"======== control =========", jt_noop, 0, "control commands"},
+        {"help", Parser_help, 0, "help"},
+        {"lustre_build_version", jt_get_version, 0,
+         "print the build version of lustre\n"
+         "usage: lustre_build_version"},
+        {"exit", jt_quit, 0, "quit"},
+        {"quit", jt_quit, 0, "quit"},
 
         /* Network configuration commands */
-        {"==== network config ====", jt_noop, 0, "network config"},
-        {"--net", jt_opt_net, 0, "run <command> after setting network to <net>\n"
-         "usage: --net <tcp/elan/myrinet> <command>"},
-        {"network", jt_ptl_network, 0, "commands that follow apply to net\n"
-         "usage: network <tcp/elan/myrinet>"},
-        {"interface_list", jt_ptl_print_interfaces, 0, "print interface entries\n"
+        {"===== network config =====", jt_noop, 0, "network config"},
+        {"--net", jt_opt_net, 0,"run <command> after setting network to <net>\n"
+         "usage: --net <tcp/elan/o2ib/...> <command>"},
+        {"network", jt_ptl_network, 0, "configure LNET"
+         "usage: network up|down"},
+        {"net", jt_ptl_network, 0, "configure LNET"
+         "usage: net up|down"},
+        {"list_nids", jt_ptl_list_nids, 0, "list local NIDs"
+         "usage: list_nids [all]"},
+        {"which_nid", jt_ptl_which_nid, 0, "choose a NID"
+         "usage: which_nid NID [NID...]"},
+	{"replace_nids", jt_replace_nids, 0,
+	 "replace primary NIDs for a device\n"
+	 "usage: replace_nids <device> <nid1>[,nid2,nid3]"},
+        {"interface_list", jt_ptl_print_interfaces,0,"print interface entries\n"
          "usage: interface_list"},
-        {"add_interface", jt_ptl_add_interface, 0, "add interface entry\n"
-         "usage: add_interface ip [netmask]"},
-        {"del_interface", jt_ptl_del_interface, 0, "del interface entry\n"
-         "usage: del_interface [ip]"},
         {"peer_list", jt_ptl_print_peers, 0, "print peer entries\n"
          "usage: peer_list"},
-        {"add_peer", jt_ptl_add_peer, 0, "add an peer entry\n"
-         "usage: add_peer <nid> <host> <port>"},
-        {"del_peer", jt_ptl_del_peer, 0, "remove an peer entry\n"
-         "usage: del_peer [<nid>] [<host>] [ks]"},
-        {"conn_list", jt_ptl_print_connections, 0, "print all the connected remote nid\n"
+        {"conn_list", jt_ptl_print_connections, 0,
+         "print all the connected remote nid\n"
          "usage: conn_list"},
-        {"connect", jt_ptl_connect, 0, "connect to a remote nid\n"
-         "usage: connect <host> <port> [iIOC]"},
-        {"disconnect", jt_ptl_disconnect, 0, "disconnect from a remote nid\n"
-         "usage: disconnect [<nid>]"},
         {"active_tx", jt_ptl_print_active_txs, 0, "print active transmits\n"
          "usage: active_tx"},
-        {"mynid", jt_ptl_mynid, 0, "inform the socknal of the local nid. "
-         "The nid defaults to hostname for tcp networks and is automatically "
-         "setup for elan/myrinet networks.\n"
-         "usage: mynid [<nid>]"},
-        {"shownid", jt_ptl_shownid, 0, "print the local NID\n"
-         "usage: shownid"},
-        {"add_uuid", jt_lcfg_add_uuid, 0, "associate a UUID with a nid\n"
-         "usage: add_uuid <uuid> <nid> <net_type>"},
-        {"close_uuid", jt_obd_close_uuid, 0, "disconnect a UUID\n"
-         "usage: close_uuid <uuid> <net_type>"},
-        {"del_uuid", jt_lcfg_del_uuid, 0, "delete a UUID association\n"
-         "usage: del_uuid <uuid>"},
-        {"add_route", jt_ptl_add_route, 0,
-         "add an entry to the portals routing table\n"
-         "usage: add_route <gateway> <target> [<target>]"},
-        {"del_route", jt_ptl_del_route, 0,
-         "delete route via gateway to targets from the portals routing table\n"
-         "usage: del_route <gateway> [<target>] [<target>]"},
-        {"set_route", jt_ptl_notify_router, 0,
-         "enable/disable routes via gateway in the portals routing table\n"
-         "usage: set_route <gateway> <up/down> [<time>]"},
         {"route_list", jt_ptl_print_routes, 0,
          "print the portals routing table, same as show_route\n"
          "usage: route_list"},
         {"show_route", jt_ptl_print_routes, 0,
          "print the portals routing table, same as route_list\n"
          "usage: show_route"},
-        {"fail", jt_ptl_fail_nid, 0, "fail/restore communications.\n"
-         "Omitting the count means indefinitely, 0 means restore, "
-         "otherwise fail 'count' messages.\n"
-         "usage: fail nid|_all_ [count]"},
+        {"ping", jt_ptl_ping, 0, "Check LNET connectivity\n"
+         "usage: ping nid [timeout] [pid]"},
 
         /* Device selection commands */
-        {"=== device selection ===", jt_noop, 0, "device selection"},
-        {"newdev", jt_lcfg_newdev, 0, "create a new device\n"
-         "usage: newdev"},
+        {"==== obd device selection ====", jt_noop, 0, "device selection"},
         {"device", jt_obd_device, 0,
-         "set current device to <%name|$name|devno>\n"
+         "set current device to <name|devno>\n"
          "usage: device <%name|$name|devno>"},
-        {"cfg_device", jt_lcfg_device, 0,
-         "set current device being configured to <$name>\n"
-         "usage: cfg_device <name>"},
         {"device_list", jt_obd_list, 0, "show all devices\n"
          "usage: device_list"},
         {"dl", jt_obd_list, 0, "show all devices\n"
-         "usage: dl"},
-        {"lustre_build_version", jt_get_version, 0,
-         "print the build version of lustre\n"
-         "usage: lustre_build_version"},
-
-        /* Device configuration commands */
-        {"==== device config =====", jt_noop, 0, "device config"},
-        {"attach", jt_lcfg_attach, 0,
-         "set the type of the current device (with <name> and <uuid>)\n"
-         "usage: attach type [name [uuid]]"},
-        {"setup", jt_lcfg_setup, 0,
-         "type specific device configuration information\n"
-         "usage: setup <args...>"},
-        {"cleanup", jt_obd_cleanup, 0, "cleanup previously setup device\n"
-         "usage: cleanup [force | failover]"},
-        {"detach", jt_obd_detach, 0,
-         "remove driver (and name and uuid) from current device\n"
-         "usage: detach"},
-        {"lov_setup", jt_lcfg_lov_setup, 0, "create a LOV device\n"
-         "usage: lov_setup lov-uuid stripe-count stripe-size offset pattern"},
-        {"lmv_setup", jt_lcfg_lmv_setup, 0,
-         "create an LMV device\n"
-         "usage: lmv_setup lmv-uuid UUID1 [UUID2 ...]"},
-        {"lov_modify_tgts", jt_lcfg_lov_modify_tgts, 0,
-         "add or delete an obd to/from a LOV device\n"
-         "usage: lov_modify_tgts add|del <lov-name> <uuid> <index> <gen>"},
-        {"lov_getconfig", jt_obd_lov_getconfig, 0,
-         "read lov configuration from an mds device\n"
-         "usage: lov_getconfig lov-uuid"},
-        {"lmv_modify_tgts", jt_lcfg_lmv_modify_tgts, 0,
-         "add an mdc to a LMV device\n"
-         "usage: lmv_modify_tgts add <lmv_name> <mdc_uuid>"},
-        {"record", jt_cfg_record, 0, "record commands that follow in log\n"
-         "usage: record cfg-uuid-name"},
-        {"endrecord", jt_cfg_endrecord, 0, "stop recording\n"
-         "usage: endrecord"},
-        {"parse", jt_cfg_parse, 0, "parse the log of recorded commands for this config\n"
-         "usage: parse config-uuid-name"},
-        {"dump_log", jt_cfg_dump_log, 0, "print log of recorded commands for this config to kernel debug log\n"
-         "usage: dump_log config-uuid-name"},
-        {"clear_log", jt_cfg_clear_log, 0, "delete current config log of recorded commands\n"
-         "usage: clear_log config-name"},
+         "usage: dl [-t]"},
 
         /* Device operations */
-        {"=== device operations ==", jt_noop, 0, "device operations"},
-        {"probe", jt_obd_connect, 0,
-         "build a connection handle to a device.  This command is used to "
-         "suspend configuration until lctl has ensured that the mds and osc "
-         "services are available.  This is to avoid mount failures in a "
-         "rebooting cluster.\n"
-         "usage: probe [timeout]"},
-        {"close", jt_obd_disconnect, 0,
-         "close the connection handle\n"
-         "usage: close"},
-        {"getattr", jt_obd_getattr, 0,
-         "get attribute for OST object <objid>\n"
-         "usage: getattr <objid>"},
-        {"setattr", jt_obd_setattr, 0,
-         "set mode attribute for OST object <objid>\n"
-         "usage: setattr <objid> <mode>"},
-         {"create", jt_obd_create, 0,
-         "create <num> OST objects (with <mode>)\n"
-         "usage: create [num [mode [verbose [lsm data]]]]"},
-        {"destroy", jt_obd_destroy, 0,
-         "destroy OST object <objid> [num [verbose]]\n"
-         "usage: destroy <num> objects, starting at objid <objid>"},
-        {"test_getattr", jt_obd_test_getattr, 0,
-         "do <num> getattrs (on OST object <objid> (objid+1 on each thread))\n"
-         "usage: test_getattr <num> [verbose [[t]objid]]"},
-        {"test_setattr", jt_obd_test_setattr, 0,
-         "do <num> setattrs (on OST object <objid> (objid+1 on each thread))\n"
-         "usage: test_setattr <num> [verbose [[t]objid]]"},
-        {"test_brw", jt_obd_test_brw, 0,
-         "do <num> bulk read/writes (<npages> per I/O, on OST object <objid>)\n"
-         "usage: test_brw [t]<num> [write [verbose [npages [[t]objid]]]]"},
-        {"get_stripe", jt_obd_get_stripe, 0,
-         "show stripe info for an echo client object\n"
-         "usage: get_stripe objid\n"},
-        {"set_stripe", jt_obd_set_stripe, 0,
-         "set stripe info for an echo client object\n"
-         "usage: set_stripe objid[=width!count[@offset][:id:id...]\n"},
-        {"unset_stripe", jt_obd_unset_stripe, 0,
-         "unset stripe info for an echo client object\n"
-         "usage: unset_stripe objid\n"},
-        {"test_ldlm", jt_obd_test_ldlm, 0,
-         "perform lock manager test\n"
-         "usage: test_ldlm"},
-        {"ldlm_regress_start", jt_obd_ldlm_regress_start, 0,
-         "start lock manager stress test\n"
-         "usage: ldlm_regress_start [numthreads [refheld [numres [numext]]]]"},
-        {"ldlm_regress_stop", jt_obd_ldlm_regress_stop, 0,
-         "stop lock manager stress test (no args)\n"},
-        {"dump_ldlm", jt_obd_dump_ldlm, 0,
-         "dump all lock manager state (no args)"},
-        {"disable_recovery", jt_obd_disable_recovery, 0, "disable recovery on an import\n"},
-        {"enable_recovery", jt_obd_enable_recovery, 0, "enable recovery on an import\n"},
+        {"==== obd device operations ====", jt_noop, 0, "device operations"},
         {"activate", jt_obd_activate, 0, "activate an import\n"},
-        {"deactivate", jt_obd_deactivate, 0, "deactivate an import\n"},
-        {"recover", jt_obd_recover, 0, "usage: recover [<connection UUID>]"},
-        {"lookup", jt_obd_mdc_lookup, 0, "usage: lookup <directory> <file>"},
-        {"notransno", jt_obd_no_transno, 0,
-         "disable sending of committed-transno updates\n"},
-        {"readonly", jt_obd_set_readonly, 0,
-         "disable writes to the underlying device\n"},
+        {"deactivate", jt_obd_deactivate, 0, "deactivate an import. "
+         "This command should be used on failed OSC devices in an MDT LOV.\n"},
         {"abort_recovery", jt_obd_abort_recovery, 0,
-         "abort recovery on MDS device\n"},
-        {"root_squash", jt_obd_root_squash, 0,
-         "squash root to 'uid:gid' except client 'nid'\n"
-         "usage: root_squash [uid:gid [nid]]\n"},
-        {"start", jt_obd_start, 0,
-         "setup mds/ost from the llog file\n"
-         "usage: start <profilename>"},
-        {"mount_option", jt_lcfg_mount_option, 0, 
-         "usage: mount_option profile osc_name [mdc_name] [gsc_name] \n"},
-        {"del_mount_option", jt_lcfg_del_mount_option, 0,
-         "usage: del_mount_option profile\n"},
+         "abort recovery on a restarting MDT or OST device\n"},
         {"set_timeout", jt_lcfg_set_timeout, 0,
-         "usage: set_timeout <secs>\n"},
-        {"set_lustre_upcall", jt_lcfg_set_lustre_upcall, 0,
-         "usage: set_lustre_upcall </full/path/to/upcall> \n"},
-        {"add_conn ", jt_lcfg_add_conn, 0,
-         "usage: add_conn <conn_uuid> [priority]\n"},
-        {"del_conn ", jt_lcfg_del_conn, 0,
-         "usage: del_conn <conn_uuid> \n"},
-        {"set_security", jt_lcfg_set_security, 0,
-         "usage: set_security key value\n"},
-        {"audit", jt_set_audit, 0,
-         "usage: audit type operations filename\n"},
-        {"fs_audit", jt_set_fsaudit, 0,
-         "usage: fs_audit type operations mountpoint\n"},
-        {"lsync", jt_obd_reint_sync, 0,
-         "usage: lsync\n"},  
-        {"cache_on", jt_obd_cache_on, 0,
-         "usage: lsync\n"},  
-        {"cache_off", jt_obd_cache_off, 0,
-         "usage: lsync\n"},  
-/*
-        {"obd_flush_cred", jt_obd_flush_cred, 0,
-         "usage: obd_flush_cred [all]\n"},
-*/
-        /*snap operations*/
-        {"snap_add", jt_obd_snap_add, 0, 
-         "usage: snap_add <dev_name> <snap_name>\n"}, 
-        /* Llog operations */ 
-        {"llog_catlist", jt_llog_catlist, 0, 
-         "list all catalog logs on current device.\n"
-         "usage: llog_catlist"},
-        {"llog_info", jt_llog_info, 0,
-         "print log header information.\n"
-         "usage: llog_info <$logname|#oid#ogr#ogen>\n"
-         "       oid, ogr and ogen are hexadecimal."},
-        {"llog_print", jt_llog_print, 0,
-         "print log content information.\n"
-         "usage: llog_print <$logname|#oid#ogr#ogen> [from] [to]\n"
-         "       oid, ogr and ogen are hexadecimal.\n"
-         "       print all records from index 1 by default."},
-        {"llog_check", jt_llog_check, 0,
-         "print log content information.\n"
-         "usage: llog_check <$logname|#oid#ogr#ogen> [from] [to]\n"
-         "       oid, ogr and ogen are hexadecimal.\n"
-         "       check all records from index 1 by default."},
-         {"llog_cancel", jt_llog_cancel, 0,
-         "cancel one record in log.\n"
-         "usage: llog_cancel <catalog id|catalog name> <log id> <index>"},
-        {"llog_remove", jt_llog_remove, 0,
-         "remove one log from catalog, erase it from disk.\n"
-         "usage: llog_remove <catalog id|catalog name> <log id>"},
-        
-        /* Misc commands */
-        {"flush_cred", jt_flush_cred, 0,
-         "flush the client side credential.\n"
-         "usage: flush_cred [mountpoint]..."},
-        {"set_crypt", jt_set_lkey_type, 0,
-         "set lustre key management type, only support gks and mks\n"
-         "usage: set_crypt [dir] [gks|mks]...."},
-        
+         "usage: conf_param obd_timeout=<secs>\n"},
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+        {"conf_param", jt_lcfg_mgsparam, 0,"set a permanent config parameter.\n"
+         "This command must be run on the MGS node\n"
+         "usage: conf_param [-d] <target.keyword=val>\n"
+         "  -d  Remove the permanent setting."},
+#endif
+        {"local_param", jt_lcfg_param, 0, "set a temporary, local param\n"
+         "usage: local_param <target.keyword=val>\n"},
+        {"get_param", jt_lcfg_getparam, 0, "get the Lustre or LNET parameter\n"
+         "usage: get_param [-n|-N|-F] <param_path1 param_path2 ...>\n"
+         "Get the value of Lustre or LNET parameter from the specified path.\n"
+         "The path can contain shell-style filename patterns.\n"
+         "  -n  Print only the value and not parameter name.\n"
+         "  -N  Print only matched parameter names and not the values.\n"
+         "      (Especially useful when using patterns.)\n"
+         "  -F  When -N specified, add '/', '@' or '=' for directories,\n"
+         "      symlinks and writeable files, respectively."},
+        {"set_param", jt_lcfg_setparam, 0, "set the Lustre or LNET parameter\n"
+	 "usage: set_param [-n] [-P] [-d]"
+	 "<param_path1=value1 param_path2=value2 ...>\n"
+	 "Set the value of the Lustre or LNET parameter at the specified path.\n"
+	 "  -n  Disable printing of the key name when printing values.\n"
+	 "  -P  Set the parameter permanently, filesystem-wide.\n"
+	 "  -d  Remove the permanent setting (only with -P option).\n"},
+	{"list_param", jt_lcfg_listparam, 0,
+         "list the Lustre or LNET parameter name\n"
+         "usage: list_param [-F|-R] <param_path1 param_path2 ...>\n"
+         "List the name of Lustre or LNET parameter from the specified path.\n"
+         "  -F  Add '/', '@' or '=' for dirs, symlinks and writeable files,\n"
+                "respectively.\n"
+         "  -R  Recursively list all parameters under the specified path.\n"},
+
         /* Debug commands */
-        {"======== debug =========", jt_noop, 0, "debug"},
+        {"==== debugging control ====", jt_noop, 0, "debug"},
         {"debug_daemon", jt_dbg_debug_daemon, 0,
          "debug daemon control and dump to a file\n"
          "usage: debug_daemon {start file [#MB]|stop}"},
@@ -548,14 +179,15 @@ command_t cmdlist[] = {
          "get debug buffer and dump to a file, same as debug_kernel\n"
          "usage: dk [file] [raw]"},
         {"debug_file", jt_dbg_debug_file, 0,
-         "read debug buffer from input and dump to output, same as df\n"
-         "usage: debug_file <input> [output] [raw]"},
+         "convert a binary debug file dumped by the kernel to ASCII text\n"
+         "usage: debug_file <input> [output]"},
         {"df", jt_dbg_debug_file, 0,
          "read debug buffer from input and dump to output, same as debug_file\n"
-         "usage: df <input> [output] [raw]"},
+         "usage: df <input> [output]"},
         {"clear", jt_dbg_clear_debug_buf, 0, "clear kernel debug buffer\n"
          "usage: clear"},
-        {"mark", jt_dbg_mark_debug_buf, 0,"insert marker text in kernel debug buffer\n"
+        {"mark", jt_dbg_mark_debug_buf, 0,
+         "insert marker text in kernel debug buffer\n"
          "usage: mark <text>"},
         {"filter", jt_dbg_filter, 0, "filter message type\n"
          "usage: filter <subsystem id/debug mask>"},
@@ -566,22 +198,258 @@ command_t cmdlist[] = {
         {"modules", jt_dbg_modules, 0,
          "provide gdb-friendly module information\n"
          "usage: modules <path>"},
-        {"panic", jt_dbg_panic, 0, "force the kernel to panic\n"
-         "usage: panic"},
-        {"lwt", jt_ptl_lwt, 0,
-         "light-weight tracing\n"
-         "usage: lwt start\n"
-         "       lwt stop [file]"},
+
+        /* virtual block operations */
+        {"==== virtual block device ====", jt_noop, 0, "virtual block device"},
+        {"blockdev_attach", jt_blockdev_attach, 0,
+         "attach a lustre regular file to a virtual block device\n"
+         "usage: blockdev_attach <file_name> <device_name>"},
+        {"blockdev_detach", jt_blockdev_detach, 0,
+         "detach a lustre regular file from a virtual block device\n"
+         "usage: blockdev_detach <device_name>"},
+        {"blockdev_info", jt_blockdev_info, 0,
+         "get the device info of a attached file\n"
+         "usage: blockdev_info <device_name>"},
+
+        /* Pool commands */
+        {"===  Pools ==", jt_noop, 0, "pool management"},
+        {"pool_new", jt_pool_cmd, 0,
+         "add a new pool\n"
+	 "usage: pool_new <fsname>.<poolname>"},
+	{"pool_add", jt_pool_cmd, 0,
+         "add the named OSTs to the pool\n"
+	 "usage: pool_add <fsname>.<poolname> <ostname indexed list>"},
+        {"pool_remove", jt_pool_cmd, 0,
+         "remove the named OST from the pool\n"
+	 "usage: pool_remove <fsname>.<poolname> <ostname indexed list>"},
+        {"pool_destroy", jt_pool_cmd, 0,
+         "destroy a pool\n"
+	 "usage: pool_destroy <fsname>.<poolname>"},
+        {"pool_list", jt_pool_cmd, 0,
+         "list pools and pools members\n"
+	 "usage: pool_list  <fsname>[.<poolname>] | <pathname>"},
+
+	/* Nodemap commands */
+	{"=== Nodemap ===", jt_noop, 0, "nodemap management"},
+	{"nodemap_activate", jt_nodemap_activate, 0,
+	 "activate nodemap idmapping functions\n"
+	 "usage: nodemap_activate"},
+	{"nodemap_add", jt_nodemap_add, 0,
+	 "add a new nodemap\n"
+	 "usage: nodemap_add <nodemap_name>"},
+	{"nodemap_del", jt_nodemap_del, 0,
+	 "remove a nodemap\n"
+	 "usage: nodemap_del <nodemap_name>"},
+	{"nodemap_add_range", jt_nodemap_add_range, 0,
+	 "add a range to a nodemap\n"
+	 "usage: nodemap_add_range <NID range>"},
+	{"nodemap_del_range", jt_nodemap_del_range, 0,
+	 "add a range to a nodemap\n"
+	 "usage: nodemap_del_range <NID range>"},
+	{"nodemap_modify", jt_nodemap_modify, 0,
+	 "modify a nodemap parameters"
+	 "usage: nodemap_modify nodemap_name param value"},
+	{"nodemap_add_idmap", jt_nodemap_add_idmap, 0,
+	 "add a UID or GID mapping to a nodemap"},
+	{"nodemap_del_idmap", jt_nodemap_del_idmap, 0,
+	 "delete a UID or GID mapping from a nodemap"},
+	{"nodemap_test_nid", jt_nodemap_test_nid, 0,
+	 "usage: nodemap_test_nid <nid>"},
+	{"nodemap_test_id", jt_nodemap_test_id, 0,
+	 "Usage: nodemap_test_id --nid <nid> --idtype [uid|gid] --id <id>"},
+
+        /* Changelog commands */
+        {"===  Changelogs ==", jt_noop, 0, "changelog user management"},
+        {"changelog_register", jt_changelog_register, 0,
+         "register a new persistent changelog user, returns id\n"
+         "usage:\tdevice <mdtname>\n\tchangelog_register [-n]"},
+        {"changelog_deregister", jt_changelog_deregister, 0,
+         "deregister an existing changelog user\n"
+         "usage:\tdevice <mdtname>\n\tchangelog_deregister <id>"},
+
+        /* Device configuration commands */
+        {"== device setup (these are not normally used post 1.4) ==",
+                jt_noop, 0, "device config"},
+        {"attach", jt_lcfg_attach, 0,
+         "set the type, name, and uuid of the current device\n"
+         "usage: attach type name uuid"},
+        {"detach", jt_obd_detach, 0,
+         "remove driver (and name and uuid) from current device\n"
+         "usage: detach"},
+        {"setup", jt_lcfg_setup, 0,
+         "type specific device configuration information\n"
+         "usage: setup <args...>"},
+        {"cleanup", jt_obd_cleanup, 0, "cleanup previously setup device\n"
+         "usage: cleanup [force | failover]"},
+        {"dump_cfg", jt_cfg_dump_log, 0,
+         "print log of recorded commands for this config to kernel debug log\n"
+         "usage: dump_cfg config-uuid-name"},
+
+        /* Test only commands */
+        {"==== testing (DANGEROUS) ====", jt_noop, 0, "testing (DANGEROUS)"},
+        {"--threads", jt_opt_threads, 0,
+         "run <threads> separate instances of <command> on device <devno>\n"
+         "--threads <threads> <verbose> <devno> <command [args ...]>"},
+        {"lookup", jt_obd_mdc_lookup, 0, "report file mode info\n"
+         "usage: lookup <directory> <file>"},
+        {"readonly", jt_obd_set_readonly, 0,
+         "disable writes to the underlying device\n"},
+        {"notransno", jt_obd_no_transno, 0,
+         "disable sending of committed-transno updates\n"},
+        {"add_uuid", jt_lcfg_add_uuid, 0, "associate a UUID with a nid\n"
+         "usage: add_uuid <uuid> <nid>"},
+        {"del_uuid", jt_lcfg_del_uuid, 0, "delete a UUID association\n"
+         "usage: del_uuid <uuid>"},
+        {"add_peer", jt_ptl_add_peer, 0, "add an peer entry\n"
+         "usage: add_peer <nid> <host> <port>"},
+        {"del_peer", jt_ptl_del_peer, 0, "remove an peer entry\n"
+         "usage: del_peer [<nid>] [<ipaddr|pid>]"},
+        {"add_conn ", jt_lcfg_add_conn, 0,
+         "usage: add_conn <conn_uuid> [priority]\n"},
+        {"del_conn ", jt_lcfg_del_conn, 0,
+         "usage: del_conn <conn_uuid> \n"},
+        {"disconnect", jt_ptl_disconnect, 0, "disconnect from a remote nid\n"
+         "usage: disconnect [<nid>]"},
+        {"push", jt_ptl_push_connection, 0, "flush connection to a remote nid\n"
+         "usage: push [<nid>]"},
+        {"mynid", jt_ptl_mynid, 0, "inform the socknal of the local nid. "
+         "The nid defaults to hostname for tcp networks and is automatically "
+         "setup for elan/myrinet networks.\n"
+         "usage: mynid [<nid>]"},
+        {"fail", jt_ptl_fail_nid, 0, "fail/restore communications.\n"
+         "Omitting the count means indefinitely, 0 means restore, "
+         "otherwise fail 'count' messages.\n"
+         "usage: fail nid|_all_ [count]"},
+
+        /*Test commands for echo client*/
+        {"test_create", jt_obd_test_create, 0,
+         "create files on MDT by echo client\n"
+         "usage: test_create [-d parent_basedir] <-D parent_count> "
+         "[-b child_base_id] <-c stripe_count> <-n count> <-t time>\n"},
+        {"test_mkdir", jt_obd_test_mkdir, 0,
+         "mkdir on MDT by echo client\n"
+         "usage: test_mkdir [-d parent_basedir] <-D parent_count>"
+         "[-b child_base_id] [-n count] <-t time>\n"},
+        {"test_destroy", jt_obd_test_destroy, 0,
+         "Destroy files on MDT by echo client\n"
+         "usage: test_destroy [-d parent_basedir] <-D parent_count>"
+         "[-b child_base_id] [-n count] <-t time>\n"},
+        {"test_rmdir", jt_obd_test_rmdir, 0,
+         "rmdir on MDT by echo client\n"
+         "usage: test_rmdir [-d parent_basedir] <-D parent_count>"
+         "[-b child_base_id] [-n count] <-t time>\n"},
+        {"test_lookup", jt_obd_test_lookup, 0,
+         "lookup files on MDT by echo client\n"
+         "usage: test_lookup [-d parent_basedir] <-D parent_count>"
+         "[-b child_base_id] [-n count] <-t time>\n"},
+        {"test_setxattr", jt_obd_test_setxattr, 0,
+         "Set EA for files/directory on MDT by echo client\n"
+         "usage: test_setxattr [-d parent_baseid] <-D parent_count>"
+         "[-b child_base_id] [-n count] <-t time>\n"},
+        {"test_md_getattr", jt_obd_test_md_getattr, 0,
+         "getattr files on MDT by echo client\n"
+         "usage: test_md_getattr [-d parent_basedir] <-D parent_count>"
+         "[-b child_base_id] [-n count] <-t time>\n"},
+        {"getattr", jt_obd_getattr, 0,
+         "get attribute for OST object <objid>\n"
+         "usage: getattr <objid>"},
+        {"setattr", jt_obd_setattr, 0,
+         "set mode attribute for OST object <objid>\n"
+         "usage: setattr <objid> <mode>"},
+        {"create", jt_obd_create, 0,
+         "create <num> OST objects (with <mode>)\n"
+         "usage: create [num [mode [verbose [lsm data]]]]"},
+        {"destroy", jt_obd_destroy, 0,
+         "destroy OST object <objid> [num [verbose]]\n"
+         "usage: destroy <num> objects, starting at objid <objid>"},
+        {"test_getattr", jt_obd_test_getattr, 0,
+         "do <num> getattrs (on OST object <objid> (objid+1 on each thread))\n"
+         "usage: test_getattr <num> [verbose [[t]objid]]"},
+        {"test_setattr", jt_obd_test_setattr, 0,
+         "do <num> setattrs (on OST object <objid> (objid+1 on each thread))\n"
+         "usage: test_setattr <num> [verbose [[t]objid]]"},
+        {"test_brw", jt_obd_test_brw, 0,
+         "do <num> bulk read/writes (<npages> per I/O, on OST object <objid>)\n"
+         "usage: test_brw [t]<num> [write [verbose [npages [[t]objid]]]]"},
         {"memhog", jt_ptl_memhog, 0,
          "memory pressure testing\n"
          "usage: memhog <page count> [<gfp flags>]"},
-                
-        /* User interface commands */
-        {"======= control ========", jt_noop, 0, "control commands"},
-        {"help", Parser_help, 0, "help"},
-        {"exit", jt_quit, 0, "quit"},
-        {"quit", jt_quit, 0, "quit"},
-        { 0, 0, 0, NULL }
+        {"getobjversion", jt_get_obj_version, 0,
+         "get the version of an object on servers\n"
+	 "usage: getobjversion <fid>\n"
+	 "	 getobjversion -i <id> -g <group>"},
+
+	/* LFSCK commands */
+	{"==== LFSCK ====", jt_noop, 0, "LFSCK"},
+	{"lfsck_start", jt_lfsck_start, 0, "start LFSCK\n"
+	 "usage: 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]"},
+	{"lfsck_stop", jt_lfsck_stop, 0, "stop lfsck(s)\n"
+	 "usage: lfsck_stop <-M | --device [MDT,OST]_device>\n"
+	 "		    [-A | --all] [-h | --help]"},
+
+	{"==== obsolete (DANGEROUS) ====", jt_noop, 0, "obsolete (DANGEROUS)"},
+	/* some test scripts still use these */
+	{"cfg_device", jt_obd_device, 0,
+	 "set current device to <name>\n"
+	 "usage: device <name>"},
+	{"recover", jt_obd_recover, 0,
+	 "try to restore a lost connection immediately\n"
+	 "usage: recover [MDC/OSC device]"},
+	/* saving for sanity 44a */
+	{"lov_getconfig", jt_obd_lov_getconfig, 0,
+	 "read lov configuration from an mds device\n"
+	 "usage: lov_getconfig <mountpoint>"},
+	/* Llog operations */
+	{"llog_catlist", jt_llog_catlist, 0,
+	 "list all catalog logs on current device.\n"
+	 "usage: llog_catlist"},
+	{"llog_info", jt_llog_info, 0,
+	 "print log header information.\n"
+	 "usage: llog_info <$logname|#oid#ogr#ogen>\n"
+	 "       oid, ogr and ogen are hexadecimal."},
+	{"llog_print", jt_llog_print, 0,
+	 "print log content information.\n"
+	 "usage: llog_print <$logname|#oid#ogr#ogen> [from] [to]\n"
+	 "       oid, ogr and ogen are hexadecimal.\n"
+	 "       print all records from index 1 by default."},
+	{"llog_check", jt_llog_check, 0,
+	 "print log content information.\n"
+	 "usage: llog_check <$logname|#oid#ogr#ogen> [from] [to]\n"
+	 "       oid, ogr and ogen are hexadecimal.\n"
+	 "       check all records from index 1 by default."},
+	 {"llog_cancel", jt_llog_cancel, 0,
+	 "cancel one record in log.\n"
+	 "This command supports both positional and optional arguments\n"
+	 "usage (positional args): "
+	 "llog_cancel <catalog id|catalog name> [log id] <index>\n"
+	 "usage (optional args): "
+	 "llog_cancel --catalog <catalog id|catalog name> --log_id <log_id> "
+	 "--log_idx <index>"},
+	{"llog_remove", jt_llog_remove, 0,
+	 "remove one log from catalog or plain log, erase it from disk.\n"
+	 "usage: llog_remove <catalog id|catalog name> <log id>"},
+	/* network operations */
+	{"add_interface", jt_ptl_add_interface, 0, "add interface entry\n"
+	 "usage: add_interface ip [netmask]"},
+	{"del_interface", jt_ptl_del_interface, 0, "del interface entry\n"
+	 "usage: del_interface [ip]"},
+	{"add_route", jt_ptl_add_route, 0,
+	 "add an entry to the portals routing table\n"
+	 "usage: add_route <gateway> [<hops> [<priority>]]"},
+	{"del_route", jt_ptl_del_route, 0,
+	 "delete route via gateway to targets from the portals routing table\n"
+	 "usage: del_route <gateway> [<target>] [<target>]"},
+	{"set_route", jt_ptl_notify_router, 0,
+	 "enable/disable routes via gateway in the portals routing table\n"
+	 "usage: set_route <gateway> <up/down> [<time>]"},
+
+	{ 0, 0, 0, NULL }
 };
 
 int lctl_main(int argc, char **argv)
@@ -605,10 +473,10 @@ int lctl_main(int argc, char **argv)
         }
 
         obd_finalize(argc, argv);
-        return rc;
+        return rc < 0 ? -rc : rc;
 }
 
-#if !LIBLUSTRE_TEST
+#ifndef LIBLUSTRE_TEST
 int main (int argc, char **argv)
 {
         return (lctl_main (argc, argv));