librados: fix locking on get_required_monitor_features

This wasn't taking the MonClient lock: should use
with_monmap to protect access to MonClient::monmap.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit ef517d0ea0dd4754fe725ae8d6f01209b58130be)

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index a62da35f70ff324c2baab7b1638c6e41e0468a0b..a9d429a4320c94af2550eac423bdedc899c3d989 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -1098,5 +1098,6 @@ int librados::RadosClient::service_daemon_update_status(
 
 mon_feature_t librados::RadosClient::get_required_monitor_features() const
 {
-  return monclient.monmap.get_required_features();
+  return monclient.with_monmap([](const MonMap &monmap) {
+      return monmap.get_required_features(); } );
 }