From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Nov 2019 23:50:02 +0000 (-0600)
Subject: mon/ConfigMonitor: do not assimilate CLUSTER_CREATE options
X-Git-Tag: v15.1.0~902^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c751bf21dc6f1fcaae7757074c1a9e9ab1d20a88;p=ceph.git

mon/ConfigMonitor: do not assimilate CLUSTER_CREATE options

These are only useful when the mon first bootstrapped--no reason to pull
them into the cluster config.

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

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index aeaa74ce1a8e..a8ca0c668925 100644
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -576,7 +576,8 @@ bool ConfigMonitor::prepare_command(MonOpRequestRef op)
 	  o = mon->mgrmon()->find_module_option(key);
 	}
 	if (!o ||
-	    o->flags & Option::FLAG_NO_MON_UPDATE) {
+	    (o->flags & Option::FLAG_NO_MON_UPDATE) ||
+	    (o->flags & Option::FLAG_CLUSTER_CREATE)) {
 	  goto skip;
 	}
 	// normalize