SERVER-23299 When starting mongod, clear temp flags from collections if appropriate.

See the description in SERVER-23299 for the definition of appropriate.

2 files changed, 8 insertions, 0 deletions

diff --git a/src/mongo/db/storage/kv/kv_collection_catalog_entry.cpp b/src/mongo/db/storage/kv/kv_collection_catalog_entry.cpp
index 2381a80fff6..38a9d2b3b09 100644
--- a/src/mongo/db/storage/kv/kv_collection_catalog_entry.cpp
+++ b/src/mongo/db/storage/kv/kv_collection_catalog_entry.cpp
@@ -163,6 +163,12 @@ void KVCollectionCatalogEntry::updateFlags(OperationContext* txn, int newValue)
     _catalog->putMetaData(txn, ns().toString(), md);
 }
 
+void KVCollectionCatalogEntry::clearTempFlag(OperationContext* txn) {
+    MetaData md = _getMetaData(txn);
+    md.options.temp = false;
+    _catalog->putMetaData(txn, ns().ns(), md);
+}
+
 void KVCollectionCatalogEntry::updateValidator(OperationContext* txn,
                                                const BSONObj& validator,
                                                StringData validationLevel,
diff --git a/src/mongo/db/storage/kv/kv_collection_catalog_entry.h b/src/mongo/db/storage/kv/kv_collection_catalog_entry.h
index 11cc4ecafc6..3a3704e82d5 100644
--- a/src/mongo/db/storage/kv/kv_collection_catalog_entry.h
+++ b/src/mongo/db/storage/kv/kv_collection_catalog_entry.h
@@ -68,6 +68,8 @@ public:
 
     void updateFlags(OperationContext* txn, int newValue) final;
 
+    void clearTempFlag(OperationContext* txn) final;
+
     void updateValidator(OperationContext* txn,
                          const BSONObj& validator,
                          StringData validationLevel,