SERVER-21571 Do not leak ChunkManager object on error

2 files changed, 15 insertions, 21 deletions

diff --git a/src/mongo/s/config.cpp b/src/mongo/s/config.cpp
index 4566aeb0db8..f8b2076b96d 100644
--- a/src/mongo/s/config.cpp
+++ b/src/mongo/s/config.cpp
@@ -67,34 +67,30 @@ CollectionInfo::CollectionInfo(OperationContext* txn,
     : _configOpTime(std::move(opTime)) {
     _dropped = coll.getDropped();
 
-    shard(txn, new ChunkManager(coll));
-    _dirty = false;
-}
-
-CollectionInfo::~CollectionInfo() {}
-
-void CollectionInfo::resetCM(ChunkManager* cm) {
-    invariant(cm);
-    invariant(_cm);
-
-    _cm.reset(cm);
-}
-
-void CollectionInfo::shard(OperationContext* txn, ChunkManager* manager) {
     // Do this *first* so we're invisible to everyone else
+    std::unique_ptr<ChunkManager> manager(stdx::make_unique<ChunkManager>(coll));
     manager->loadExistingRanges(txn, nullptr);
 
-    // Collections with no chunks are unsharded, no matter what the collections entry says
-    // This helps prevent errors when dropping in a different process
-    //
-
+    // Collections with no chunks are unsharded, no matter what the collections entry says. This
+    // helps prevent errors when dropping in a different process.
     if (manager->numChunks() != 0) {
-        useChunkManager(ChunkManagerPtr(manager));
+        useChunkManager(std::move(manager));
     } else {
         warning() << "no chunks found for collection " << manager->getns()
                   << ", assuming unsharded";
         unshard();
     }
+
+    _dirty = false;
+}
+
+CollectionInfo::~CollectionInfo() = default;
+
+void CollectionInfo::resetCM(ChunkManager* cm) {
+    invariant(cm);
+    invariant(_cm);
+
+    _cm.reset(cm);
 }
 
 void CollectionInfo::unshard() {
diff --git a/src/mongo/s/config.h b/src/mongo/s/config.h
index 4eb80b3001d..ad179958c91 100644
--- a/src/mongo/s/config.h
+++ b/src/mongo/s/config.h
@@ -62,8 +62,6 @@ struct CollectionInfo {
 
     void resetCM(ChunkManager* cm);
 
-    void shard(OperationContext* txn, ChunkManager* cm);
-
     void unshard();
 
     bool isDirty() const {