]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/ConfigMonitor: do not assimilate CLUSTER_CREATE options
authorSage Weil <sage@redhat.com>
Tue, 12 Nov 2019 23:50:02 +0000 (17:50 -0600)
committerSage Weil <sage@redhat.com>
Tue, 12 Nov 2019 23:50:34 +0000 (17:50 -0600)
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>
src/mon/ConfigMonitor.cc

index aeaa74ce1a8e598184fb425167c04efda4ec0ccd..a8ca0c668925d640f4e18c6b7044de8f1d83620a 100644 (file)
@@ -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