From: Sage Weil <sage@redhat.com>
Date: Mon, 14 May 2018 17:56:59 +0000 (-0500)
Subject: mon/MonClient: set configs via finisher
X-Git-Tag: v14.0.0~110^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21984%2Fhead;p=ceph.git

mon/MonClient: set configs via finisher

The config observers may want to take locks that are ordered relative
to monc_lock.

We could simply drop monc_lock for this call, but that would implicitly
rely on a single-threaded dispatch to avoid having two incoming MConfig
messages get reordered.  Explicitly putting it on a finisher is safer.
Note that we adjust the get_monmap_and_config() to start, drain, and stop
the finisher to ensure we have incoming config processed and applied
before returning.

Fixes: http://tracker.ceph.com/issues/24118
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 5f31182a7614b..1ad9e50647b16 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -374,8 +374,10 @@ void MonClient::handle_monmap(MMonMap *m)
 void MonClient::handle_config(MConfig *m)
 {
   ldout(cct,10) << __func__ << " " << *m << dendl;
-  cct->_conf->set_mon_vals(cct, m->config, config_cb);
-  m->put();
+  finisher.queue(new FunctionContext([this, m](int r) {
+	cct->_conf->set_mon_vals(cct, m->config, config_cb);
+	m->put();
+      }));
   got_config = true;
   map_cond.Signal();
 }