X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flctl.c;h=c9d69aa9cd713f2ae9bb01a40d5c509b77c1ccae;hb=fe79e1b3a463c6ff8d6a8c8be2b9505df5a5702a;hp=c7a5b33b229c1a14aced70d7d383a245c3669a21;hpb=3629f184ebbcbdbde71caba3b29cda15d03cd9cf;p=fs%2Flustre-release.git

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index c7a5b33..c9d69aa 100644
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -4,7 +4,7 @@
  *  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> 
+ *   Author: Robert Read <rread@clusterfs.com>
  *
  *   This file is part of Lustre, http://www.lustre.org.
  *
@@ -24,8 +24,10 @@
  */
 
 
+
 #include <stdlib.h>
 #include <stdio.h>
+#include <portals/api-support.h>
 #include <portals/ptlctl.h>
 #include "obdctl.h"
 #include "parser.h"
@@ -39,35 +41,69 @@ static int jt_noop(int argc, char **argv) {
         return 0;
 }
 
+static int jt_opt_ignore_errors(int argc, char **argv) {
+        Parser_ignore_errors(1);
+        return 0;
+}
+
 command_t cmdlist[] = {
         /* Metacommands */
-        {"--device", jt_opt_device, 0, "--device <devno> <command [args ...]>"},
+        {"--device", jt_opt_device, 0,
+         "run <command> after connecting to device <devno>\n"
+         "--device <devno> <command [args ...]>"},
         {"--threads", jt_opt_threads, 0,
-                "--threads <threads> <devno> <command [args ...]>"},
+         "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"},
 
         /* Network configuration commands */
         {"==== network config ====", jt_noop, 0, "network config"},
-        {"network", jt_ptl_setup, 0, "commands that follow apply to net\n"
-         "usage: network <tcp/elan/myrinet>"},       
+        {"--net", jt_opt_net, 0, "run <command> after setting network to <net>\n"
+         "usage: --net <tcp/elan/myrinet/scimac> <command>"},
+        {"network", jt_ptl_network, 0, "commands that follow apply to net\n"
+         "usage: network <tcp/elan/myrinet/scimac>"},
+        {"autoconn_list", jt_ptl_print_autoconnects, 0, "print autoconnect entries\n"
+         "usage: print_autoconns"},
+        {"add_autoconn", jt_ptl_add_autoconnect, 0, "add an autoconnect entry\n"
+         "usage: add_autoconn <nid> <host> <port> [ise]"},
+        {"del_autoconn", jt_ptl_del_autoconnect, 0, "remove an autoconnect entry\n"
+         "usage: del_autoconn [<nid>] [<host>] [ks]"},
+        {"conn_list", jt_ptl_print_connections, 0, "connect to a remote nid\n"
+         "usage: print_conns"},
         {"connect", jt_ptl_connect, 0, "connect to a remote nid\n"
-         "usage: connect [[<hostname> <port>] | <elan id>]"},
+         "usage: connect <host> <port> [iIOC]"},
         {"disconnect", jt_ptl_disconnect, 0, "disconnect from a remote nid\n"
-         "usage: disconnect <nid>"},
+         "usage: disconnect [<nid>]"},
+        {"active_tx", jt_ptl_print_active_txs, 0, "print active transmits (no args)\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]"},
-        {"add_uuid", jt_ptl_add_uuid, 0, "associate a uuid with a nid\n"
-         "usage: add_uuid <uuid> <nid>"},
-        {"del_uuid", jt_ptl_del_uuid, 0, "delete a uuid association\n"
+         "setup for elan/myrinet/scimac 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 routing table\n"
-         "usage: add_route <gateway> <target> [target]"},
+         "add an entry to the portals routing table\n"
+         "usage: add_route <gateway> <target> [<target>]"},
         {"del_route", jt_ptl_del_route, 0,
-         "delete an entry from the routing table\n"
-         "usage: del_route <target>"},
-        {"route_list", jt_ptl_print_routes, 0, "print the routing table\n"
+         "delete the route via the given gateway to the given targets from the portals routing table\n"
+         "usage: del_route <gateway> [<target>] [<target>]"},
+        {"set_route", jt_ptl_notify_router, 0,
+         "enable/disable routes via the given 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\n"
          "usage: route_list"},
         {"recv_mem", jt_ptl_rxmem, 0, "set socket receive buffer size, "
          "if size is omited the current size is reported.\n"
@@ -75,75 +111,163 @@ command_t cmdlist[] = {
         {"send_mem", jt_ptl_txmem, 0, "set socket send buffer size, "
          "if size is omited the current size is reported.\n"
          "usage: send_mem [size]"},
-        {"nagle", jt_ptl_nagle, 0, "enable/disable nagle, omiting the "
-         "argument will cause the current nagle setting to be reported.\n" 
-         "usage: nagle [on/off]"},       
-                
+        {"nagle", jt_ptl_nagle, 0, "enable/disable nagle, omitting the "
+         "argument will cause the current nagle setting to be reported.\n"
+         "usage: nagle [on/off]"},
+        {"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]"},
+
         /* Device selection commands */
         {"=== device selection ===", jt_noop, 0, "device selection"},
-        {"newdev", jt_obd_newdev, 0, "create a new device\n"
+        {"newdev", jt_lcfg_newdev, 0, "create a new device\n"
          "usage: newdev"},
-#if 0
-        {"uuid2dev", jt_obd_uuid2dev, 0,
-         "find a uuid and make it the current device\n"
-         "usage: uuid2dev <uuid>"},
-#endif
-        {"name2dev", jt_obd_name2dev, 0,
-         "find a name and make it the current device\n"
-         "usage: name2dev <name>"},
-        {"device", jt_obd_device, 0, "set current device to devno\n"
-         "usage: device <devno>"},
+        {"device", jt_obd_device, 0,
+         "set current device to <%name|$name|devno>\n"
+         "usage: device <%name|$name|devno>"},
+        {"cfg_device", jt_lcfg_device, 0,
+         "set current device being configured to <$name>\n"
+         "usage: 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_obd_attach, 0, "name and type the device\n"
+        {"attach", jt_lcfg_attach, 0,
+         "set the type of the current device (with <name> and <uuid>)\n"
          "usage: attach type [name [uuid]]"},
-        {"setup", jt_obd_setup, 0,
+        {"setup", jt_lcfg_setup, 0,
          "type specific device configuration information\n"
          "usage: setup <args...>"},
-        {"cleanup", jt_obd_cleanup, 0, "cleanup setup\n"
-         "usage: cleanup"},
-        {"detach", jt_obd_detach, 0, "un-name a device\n"
+        {"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"},
-        {"lovconfig", jt_obd_lov_config, 0,
-         "write lov configuration to a mds device\n"
-         "usage: lovconfig lov-uuid stripcount stripsize pattern UUID1 [UUID2 ...]"},
+        {"lov_setup", jt_lcfg_lov_setup, 0,
+         "write setup an lov device\n"
+         "usage: lov_setconfig lov-uuid stripe-count stripe-size offset pattern UUID1 [UUID2 ...]"},
+        {"lov_getconfig", jt_obd_lov_getconfig, 0,
+         "read lov configuration from an mds device\n"
+         "usage: lov_getconfig lov-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"},
 
         /* 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 too "
+         "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: probe [timeout]"},
+        {"close", jt_obd_disconnect, 0,
+         "close the connection handle\n"
          "usage: close"},
-        {"getattr", jt_obd_getattr, 0, "get attribute for id\n"
-         "usage: getattr <id>"},
-        {"setattr", jt_obd_setattr, 0, "set attribute for id\n"
-         "usage: setattr <id> <mode>"},
+        {"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,
-         "perform count number of getattr's\n"
-         "usage: test_getattr <count> [verbose]"},
+         "do <num> getattrs (on OST object <objid> (objid+1 on each thread))\n"
+         "usage: test_getattr <num> [verbose [[t]objid]]"},
         {"test_brw", jt_obd_test_brw, 0,
-         "perform count number of bulk read/writes\n"
-         "usage: test_brw <count> [write [verbose [pages [obdos]]]]"},
-        {"test_ldlm", jt_obd_test_ldlm, 0, "perform lock manager test\n"
+         "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)"},
+        {"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"},
+        {"abort_recovery", jt_obd_abort_recovery, 0,
+         "abort recovery on MDS device\n"},
+        {"mount_option", jt_lcfg_mount_option, 0, 
+         "usage: mount_option profile osc_name [mdc_name] \n"},
+        {"del_mount_option", jt_lcfg_del_mount_option, 0,
+         "usage: del_mount_option profile\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"},
+       
+        /* 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 <catlog id|catlog name> <log id> <index>"},
+        {"llog_remove", jt_llog_remove, 0,
+         "remove one log from catlog, erase it from disk.\n"
+         "usage: llog_remove <catlog id|catlog name> <log id>"},
 
-#if 0
-        {"create", jt_create, 0, "create [count [mode [verbose]]]"},
-        {"destroy", jt_destroy, 0, "destroy <id>"},
-        {"newconn", jt_newconn, 0, "newconn [newuuid]"},
-#endif
         /* Debug commands */
         {"======== debug =========", jt_noop, 0, "debug"},
+        {"debug_daemon", jt_dbg_debug_daemon, 0,
+         "debug daemon control and dump to a file"
+         "usage: debug_daemon [start file <#MB>|stop|pause|continue]"},
         {"debug_kernel", jt_dbg_debug_kernel, 0,
          "get debug buffer and dump to a file"
          "usage: debug_kernel [file] [raw]"},
+        {"dk", jt_dbg_debug_kernel, 0,
+         "get debug buffer and dump to a file"
+         "usage: dk [file] [raw]"},
         {"debug_file", jt_dbg_debug_file, 0,
          "read debug buffer from input and dump to output"
          "usage: debug_file <input> [output] [raw]"},
@@ -162,7 +286,14 @@ command_t cmdlist[] = {
          "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]"},
+        {"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"},
@@ -171,29 +302,33 @@ command_t cmdlist[] = {
         { 0, 0, 0, NULL }
 };
 
-
-
-int main(int argc, char **argv) 
+int lctl_main(int argc, char **argv)
 {
         int rc;
 
         setlinebuf(stdout);
 
-        if (ptl_initialize(argc, argv) < 0)
-                exit(1);
+        ptl_initialize(argc, argv);
         if (obd_initialize(argc, argv) < 0)
                 exit(2);
         if (dbg_initialize(argc, argv) < 0)
                 exit(3);
-        
+
+        Parser_init("lctl > ", cmdlist);
+
         if (argc > 1) {
                 rc = Parser_execarg(argc - 1, argv + 1, cmdlist);
         } else {
-                Parser_init("lctl > ", cmdlist);
                 rc = Parser_commands();
         }
 
-        obd_cleanup(argc, argv);
+        obd_finalize(argc, argv);
         return rc;
 }
 
+#if !LIBLUSTRE_TEST
+int main (int argc, char **argv)
+{
+        return (lctl_main (argc, argv));
+}
+#endif