From: Sage Weil <sage@redhat.com>
Date: Tue, 1 Oct 2019 16:34:22 +0000 (-0500)
Subject: mon/ConfigMonitor: allow entity type only for 'config get'
X-Git-Tag: v15.1.0~1313^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91a252dd432a9bdb44c55a9f3b66ff9b43eae9ff;p=ceph-ci.git

mon/ConfigMonitor: allow entity type only for 'config get'

e.g., 'ceph config get osd debug_osd' to return the config value that
would apply to a generic OSD (either from the osd or global section of
the config).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index c1814b28eb8..aeaa74ce1a8 100644
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -257,7 +257,8 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op)
     cmd_getval(g_ceph_context, cmdmap, "who", who);
 
     EntityName entity;
-    if (!entity.from_str(who)) {
+    if (!entity.from_str(who) &&
+	!entity.from_str(who + ".")) {
       ss << "unrecognized entity '" << who << "'";
       err = -EINVAL;
       goto reply;