From ef517d0ea0dd4754fe725ae8d6f01209b58130be Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 30 Apr 2018 11:35:18 -0400 Subject: [PATCH] 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 --- src/librados/RadosClient.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index cdca87909bb..95d119cc04b 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -1101,5 +1101,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(); } ); } -- 2.39.5