From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Dec 2018 00:05:36 +0000 (-0600)
Subject: mon/MgrMonitor: mark module options with FLAG_MGR
X-Git-Tag: v14.1.0~532^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38a3a819973ba7937f4af48c636492585d6072a6;p=ceph.git

mon/MgrMonitor: mark module options with FLAG_MGR

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

diff --git a/src/common/options.h b/src/common/options.h
index ce5671729f7b..7c58856a50f6 100644
--- a/src/common/options.h
+++ b/src/common/options.h
@@ -116,6 +116,7 @@ struct Option {
     FLAG_STARTUP = 0x4,         ///< option can only take effect at startup
     FLAG_CLUSTER_CREATE = 0x8,  ///< option only has effect at cluster creation
     FLAG_CREATE = 0x10,         ///< option only has effect at daemon creation
+    FLAG_MGR = 0x20,            ///< option is a mgr module option
   };
 
   struct size_t {
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 9d749d26494b..ae1476410cef 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -173,6 +173,7 @@ void MgrMonitor::update_from_paxos(bool *need_bootstrap)
 	       static_cast<Option::level_t>(j.second.level)));
       Option& opt = p.first->second;
       opt.set_flags(static_cast<Option::flag_t>(j.second.flags));
+      opt.set_flag(Option::FLAG_MGR);
       opt.set_description(j.second.desc.c_str());
       opt.set_long_description(j.second.long_desc.c_str());
       for (auto& k : j.second.tags) {
@@ -180,11 +181,11 @@ void MgrMonitor::update_from_paxos(bool *need_bootstrap)
       }
       for (auto& k : j.second.see_also) {
 	if (i.module_options.count(k)) {
-	  // another module option
+	  // it's another module option
 	  misc_option_strings.push_back(string("mgr/") + i.name + "/" + k);
 	  opt.add_see_also(misc_option_strings.back().c_str());
 	} else {
-	  // ceph option
+	  // it's a native option
 	  opt.add_see_also(k.c_str());
 	}
       }