From: John Spray <john.spray@redhat.com>
Date: Thu, 30 Jun 2016 23:12:13 +0000 (+0100)
Subject: mgr: fix locking in DaemonMetadata
X-Git-Tag: v11.0.1~60^2~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7c9561accefb81dec73bdd1635ec808a9d23a1f;p=ceph.git

mgr: fix locking in DaemonMetadata

Locks are great but it helps if you actually
bother acquiring them...

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mgr/DaemonMetadata.cc b/src/mgr/DaemonMetadata.cc
index dc3885c96d53..7ac0e3cb611a 100644
--- a/src/mgr/DaemonMetadata.cc
+++ b/src/mgr/DaemonMetadata.cc
@@ -19,7 +19,9 @@
 
 void DaemonMetadataIndex::insert(DaemonMetadataPtr dm)
 {
-  if (exists(dm->key)) {
+  Mutex::Locker l(lock);
+
+  if (all.count(dm->key)) {
     _erase(dm->key);
   }
 
@@ -43,6 +45,8 @@ void DaemonMetadataIndex::_erase(DaemonKey dmk)
 
 DaemonMetadataCollection DaemonMetadataIndex::get_by_type(uint8_t type) const
 {
+  Mutex::Locker l(lock);
+
   DaemonMetadataCollection result;
 
   for (const auto &i : all) {
@@ -56,6 +60,8 @@ DaemonMetadataCollection DaemonMetadataIndex::get_by_type(uint8_t type) const
 
 DaemonMetadataCollection DaemonMetadataIndex::get_by_server(const std::string &hostname) const
 {
+  Mutex::Locker l(lock);
+
   if (by_server.count(hostname)) {
     return by_server.at(hostname);
   } else {
@@ -65,11 +71,15 @@ DaemonMetadataCollection DaemonMetadataIndex::get_by_server(const std::string &h
 
 bool DaemonMetadataIndex::exists(const DaemonKey &key) const
 {
+  Mutex::Locker l(lock);
+
   return all.count(key) > 0;
 }
 
 DaemonMetadataPtr DaemonMetadataIndex::get(const DaemonKey &key)
 {
+  Mutex::Locker l(lock);
+
   return all.at(key);
 }
 
diff --git a/src/mgr/DaemonMetadata.h b/src/mgr/DaemonMetadata.h
index 4aa406c52125..b5c00a9ada16 100644
--- a/src/mgr/DaemonMetadata.h
+++ b/src/mgr/DaemonMetadata.h
@@ -108,7 +108,7 @@ class DaemonMetadataIndex
 
   std::set<DaemonKey> updating;
 
-  Mutex lock;
+  mutable Mutex lock;
 
   public: