SERVER-24629 Add concurrency protection to MetadataManager

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mongo/db/s/metadata_manager.h b/src/mongo/db/s/metadata_manager.h
index db0b3b1e255..73f91f7e44f 100644
--- a/src/mongo/db/s/metadata_manager.h
+++ b/src/mongo/db/s/metadata_manager.h
@@ -34,6 +34,7 @@
 #include "mongo/base/disallow_copying.h"
 #include "mongo/db/s/collection_metadata.h"
 #include "mongo/s/catalog/type_chunk.h"
+#include "mongo/stdx/memory.h"
 
 namespace mongo {
 
@@ -44,6 +45,7 @@ class MetadataManager {
 
 public:
     MetadataManager();
+    ~MetadataManager();
 
     /**
      * An ActiveMetadata must be set before this function can be called.
@@ -99,7 +101,10 @@ private:
      * Removes the CollectionMetadata stored in the tracker from the _metadataInUse
      * list (if it's there).
      */
-    void _removeMetadata(CollectionMetadataTracker* metadataTracker);
+    void _removeMetadata_inlock(CollectionMetadataTracker* metadataTracker);
+
+    void _addRangeToClean_inlock(const ChunkRange& range);
+    void _removeRangeToClean_inlock(const ChunkRange& range);
 
     std::unique_ptr<CollectionMetadataTracker> _activeMetadataTracker;
 
@@ -109,6 +114,8 @@ private:
     // be deleted from the shard. The map is from the minimum value of the
     // range to be deleted (e.g. BSON("key" << 0)) to the entire chunk range.
     std::map<BSONObj, ChunkRange> _rangesToClean;
+
+    stdx::mutex _managerLock;
 };
 
 class ScopedCollectionMetadata {