From: Sage Weil <sage@redhat.com>
Date: Sun, 19 Jan 2020 21:21:13 +0000 (-0600)
Subject: mon/ConfigMonitor: make 'config get' on fsid work
X-Git-Tag: v15.1.0~117^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5661dd75efd48251b7f433b1ffe01c9c52906e96;p=ceph.git

mon/ConfigMonitor: make 'config get' on fsid work

This duplicates 'ceph fsid' command, but allow this for consistency.

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

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index 0890b22692a..a599233be5d 100644
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -295,6 +295,12 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op)
 	goto reply;
       }
       if (opt->has_flag(Option::FLAG_NO_MON_UPDATE)) {
+	// handle special options
+	if (name == "fsid") {
+	  odata.append(stringify(mon->monmap->get_fsid()));
+	  odata.append("\n");
+	  goto reply;
+	}
 	err = -EINVAL;
 	ss << name << " is special and cannot be stored by the mon";
 	goto reply;