From 2ebb8e13f6f592efcc52bb4f4d7f2db38cc062f2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 19 Jul 2017 09:41:14 -0400 Subject: [PATCH] mon: 'config-key list' -> 'config-key ls' Signed-off-by: Sage Weil --- doc/man/8/ceph.rst | 2 +- doc/release-notes.rst | 1 + src/mgr/Mgr.cc | 2 +- src/mon/ConfigKeyService.cc | 3 ++- src/mon/MonCommands.h | 4 +++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst index 339d5c3d19299..7682603ac3429 100644 --- a/doc/man/8/ceph.rst +++ b/doc/man/8/ceph.rst @@ -199,7 +199,7 @@ Subcommand ``list`` lists configuration keys. Usage:: - ceph config-key list + ceph config-key ls Subcommand ``dump`` dumps configuration keys and values. diff --git a/doc/release-notes.rst b/doc/release-notes.rst index 9b40925f6722e..cc1f749694fe3 100644 --- a/doc/release-notes.rst +++ b/doc/release-notes.rst @@ -216,6 +216,7 @@ Major Changes from Kraken - ``ceph config-key dump`` dumps config-key entries and their contents. (The existing ``ceph config-key list`` only dumps the key names, not the values.) + - ``ceph config-key list`` is deprecated in favor of ``ceph config-key ls``. - ``ceph osd set-{full,nearfull,backfillfull}-ratio`` sets the cluster-wide ratio for various full thresholds (when the cluster refuses IO, when the cluster warns about being close to full, diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc index 68126e9430ed8..418a2fae57e8d 100644 --- a/src/mgr/Mgr.cc +++ b/src/mgr/Mgr.cc @@ -332,7 +332,7 @@ void Mgr::load_config() dout(10) << "listing keys" << dendl; JSONCommand cmd; - cmd.run(monc, "{\"prefix\": \"config-key list\"}"); + cmd.run(monc, "{\"prefix\": \"config-key ls\"}"); lock.Unlock(); cmd.wait(); lock.Lock(); diff --git a/src/mon/ConfigKeyService.cc b/src/mon/ConfigKeyService.cc index 3adba6dd0d530..f8e9e1aaf3dc7 100644 --- a/src/mon/ConfigKeyService.cc +++ b/src/mon/ConfigKeyService.cc @@ -241,7 +241,8 @@ bool ConfigKeyService::service_dispatch(MonOpRequestRef op) ret = -ENOENT; } - } else if (prefix == "config-key list") { + } else if (prefix == "config-key list" || + prefix == "config-key ls") { stringstream tmp_ss; store_list(tmp_ss); rdata.append(tmp_ss); diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index b04b1b7b64d57..5c6e83983f302 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -961,7 +961,9 @@ COMMAND("config-key rm " \ COMMAND("config-key exists " \ "name=key,type=CephString", \ "check for 's existence", "config-key", "r", "cli,rest") -COMMAND("config-key list ", "list keys", "config-key", "r", "cli,rest") +COMMAND_WITH_FLAG("config-key list ", "list keys", "config-key", "r", "cli,rest", + FLAG(DEPRECATED)) +COMMAND("config-key ls ", "list keys", "config-key", "r", "cli,rest") COMMAND("config-key dump", "dump keys and values", "config-key", "r", "cli,rest") -- 2.39.5