Merge branch 'wip-cephtool' into next

Usage/errmsg fixups for the ceph CLI tool

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

6 files changed, 10 insertions, 10 deletions

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index decf86db70a..0be1c8cea34 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -183,7 +183,7 @@ void CephContext::do_command(std::string command, std::string args, bufferlist *
       std::string var = args;
       size_t pos = var.find(' ');
       if (pos == string::npos) {
-	jf.dump_string("error", "set_config syntax is 'set_config <var> <value>'");
+	jf.dump_string("error", "syntax error: 'config set <var> <value>'");
       } else {
 	std::string val = var.substr(pos+1);
 	var.resize(pos);
@@ -253,7 +253,7 @@ CephContext::CephContext(uint32_t module_type_)
   _admin_socket->register_command("2", _admin_hook, "");
   _admin_socket->register_command("perf schema", _admin_hook, "dump perfcounters schema");
   _admin_socket->register_command("config show", _admin_hook, "dump current config settings");
-  _admin_socket->register_command("config set", _admin_hook, "set_config <field> <val>: set a config settings");
+  _admin_socket->register_command("config set", _admin_hook, "config set <field> <val>: set a config variable");
   _admin_socket->register_command("log flush", _admin_hook, "flush log entries to log file");
   _admin_socket->register_command("log dump", _admin_hook, "dump recent log entries to log file");
   _admin_socket->register_command("log reopen", _admin_hook, "reopen log file");
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 0dd3f1b95d9..0a3480ebced 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -780,10 +780,10 @@ void MDS::handle_command(MMonCommand *m)
 	  CDir *dir = in->get_dirfrag(frag_t());
 	  if (dir && dir->is_auth()) {
 	    mdcache->migrator->export_dir(dir, target);
-	  } else dout(0) << "bad migrate_dir path dirfrag frag_t() or dir not auth" << dendl;
-	} else dout(0) << "bad migrate_dir path" << dendl;
-      } else dout(0) << "bad migrate_dir target syntax" << dendl;
-    } else dout(0) << "bad migrate_dir syntax" << dendl;
+	  } else dout(0) << "bad export_dir path dirfrag frag_t() or dir not auth" << dendl;
+	} else dout(0) << "bad export_dir path" << dendl;
+      } else dout(0) << "bad export_dir target syntax" << dendl;
+    } else dout(0) << "bad export_dir syntax" << dendl;
   } 
   else if (m->cmd[0] == "cpu_profiler") {
     ostringstream ss;
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1bd27de323a..7b9c9235476 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1000,7 +1000,7 @@ int OSD::init()
   assert(r == 0);
   test_ops_hook = new TestOpsSocketHook(&(this->service), this->store);
   r = admin_socket->register_command("setomapval", test_ops_hook,
-                              "setomap <pool-id> <obj-name> <key> <val>");
+                              "setomapval <pool-id> <obj-name> <key> <val>");
   assert(r == 0);
   r = admin_socket->register_command("rmomapkey", test_ops_hook,
                                "rmomapkey <pool-id> <obj-name> <key>");
diff --git a/src/test/cli/ceph/help.t b/src/test/cli/ceph/help.t
index 9a035c6e7e4..eac011dc814 100644
--- a/src/test/cli/ceph/help.t
+++ b/src/test/cli/ceph/help.t
@@ -23,7 +23,7 @@
   
   MONITOR (MON) COMMANDS
     ceph mon add <name> <ip>[:<port>]
-    ceph mon delete <name>
+    ceph mon remove <name>
     ceph mon stat
     ceph mon tell <mon-id or *> injectargs '--<switch> <value> [--<switch> <value>...]'
   
diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index e791a0a748d..a1f8024cfe3 100644
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -66,7 +66,7 @@ static void usage()
   cout << "\n";
   cout << "MONITOR (MON) COMMANDS\n";
   cout << "  ceph mon add <name> <ip>[:<port>]\n";
-  cout << "  ceph mon delete <name>\n";
+  cout << "  ceph mon remove <name>\n";
   cout << "  ceph mon stat\n";
   cout << "  ceph mon tell <mon-id or *> injectargs '--<switch> <value> [--<switch> <value>...]'\n";
   cout << "\n";
diff --git a/src/tools/common.cc b/src/tools/common.cc
index 9a3763a34ae..13aff67ac6e 100644
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -274,7 +274,7 @@ int do_command(CephToolCtx *ctx,
   }
   if (cmd.size() > 0 && cmd[0] == "pg") {
     if (cmd.size() == 1) {
-      cerr << "no pgid specified" << std::endl;
+      cerr << "pg requires at least one argument" << std::endl;
       return -EINVAL;
     }
     if (pending_target_pgid.parse(cmd[1].c_str())) {