SERVER-31174 Move the sessions collection to config.system.sessions

1 files changed, 70 insertions, 58 deletions

diff --git a/src/mongo/db/system_index.cpp b/src/mongo/db/system_index.cpp
index 0c07a4e46ad..be95f1d0758 100644
--- a/src/mongo/db/system_index.cpp
+++ b/src/mongo/db/system_index.cpp
@@ -67,7 +67,7 @@ IndexSpec v3SystemUsersIndexSpec;
 IndexSpec v3SystemRolesIndexSpec;
 IndexSpec v1SystemSessionsIndexSpec;
 
-const NamespaceString sessionCollectionNamespace("admin.system.sessions");
+const NamespaceString sessionCollectionNamespace("config.system.sessions");
 
 MONGO_INITIALIZER(AuthIndexKeyPatterns)(InitializerContext*) {
     v1SystemUsersKeyPattern = BSON("user" << 1 << "userSource" << 1);
@@ -145,72 +145,84 @@ Status verifySystemIndexes(OperationContext* opCtx) {
     const NamespaceString& systemUsers = AuthorizationManager::usersCollectionNamespace;
     const NamespaceString& systemRoles = AuthorizationManager::rolesCollectionNamespace;
 
-    AutoGetDb autoDb(opCtx, systemUsers.db(), MODE_X);
-    if (!autoDb.getDb()) {
-        return Status::OK();
-    }
-
-    Collection* collection = autoDb.getDb()->getCollection(opCtx, systemUsers);
-    if (collection) {
-        IndexCatalog* indexCatalog = collection->getIndexCatalog();
-        invariant(indexCatalog);
-
-        // Make sure the old unique index from v2.4 on system.users doesn't exist.
-        std::vector<IndexDescriptor*> indexes;
-        indexCatalog->findIndexesByKeyPattern(opCtx, v1SystemUsersKeyPattern, false, &indexes);
-
-        if (!indexes.empty()) {
-            fassert(ErrorCodes::AmbiguousIndexKeyPattern, indexes.size() == 1);
-            return Status(ErrorCodes::AuthSchemaIncompatible,
-                          "Old 2.4 style user index identified. "
-                          "The authentication schema needs to be updated by "
-                          "running authSchemaUpgrade on a 2.6 server.");
+    // Create indexes for collections on the admin db
+    {
+        AutoGetDb autoDb(opCtx, systemUsers.db(), MODE_X);
+        if (!autoDb.getDb()) {
+            return Status::OK();
         }
 
-        // Ensure that system indexes exist for the user collection
-        indexCatalog->findIndexesByKeyPattern(opCtx, v3SystemUsersKeyPattern, false, &indexes);
-        if (indexes.empty()) {
-            try {
-                generateSystemIndexForExistingCollection(
-                    opCtx, collection, systemUsers, v3SystemUsersIndexSpec);
-            } catch (...) {
-                return exceptionToStatus();
+        Collection* collection = autoDb.getDb()->getCollection(opCtx, systemUsers);
+        if (collection) {
+            IndexCatalog* indexCatalog = collection->getIndexCatalog();
+            invariant(indexCatalog);
+
+            // Make sure the old unique index from v2.4 on system.users doesn't exist.
+            std::vector<IndexDescriptor*> indexes;
+            indexCatalog->findIndexesByKeyPattern(opCtx, v1SystemUsersKeyPattern, false, &indexes);
+
+            if (!indexes.empty()) {
+                fassert(ErrorCodes::AmbiguousIndexKeyPattern, indexes.size() == 1);
+                return Status(ErrorCodes::AuthSchemaIncompatible,
+                              "Old 2.4 style user index identified. "
+                              "The authentication schema needs to be updated by "
+                              "running authSchemaUpgrade on a 2.6 server.");
+            }
+
+            // Ensure that system indexes exist for the user collection
+            indexCatalog->findIndexesByKeyPattern(opCtx, v3SystemUsersKeyPattern, false, &indexes);
+            if (indexes.empty()) {
+                try {
+                    generateSystemIndexForExistingCollection(
+                        opCtx, collection, systemUsers, v3SystemUsersIndexSpec);
+                } catch (...) {
+                    return exceptionToStatus();
+                }
             }
         }
-    }
 
-    // Ensure that system indexes exist for the roles collection, if it exists.
-    collection = autoDb.getDb()->getCollection(opCtx, systemRoles);
-    if (collection) {
-        IndexCatalog* indexCatalog = collection->getIndexCatalog();
-        invariant(indexCatalog);
-
-        std::vector<IndexDescriptor*> indexes;
-        indexCatalog->findIndexesByKeyPattern(opCtx, v3SystemRolesKeyPattern, false, &indexes);
-        if (indexes.empty()) {
-            try {
-                generateSystemIndexForExistingCollection(
-                    opCtx, collection, systemRoles, v3SystemRolesIndexSpec);
-            } catch (...) {
-                return exceptionToStatus();
+        // Ensure that system indexes exist for the roles collection, if it exists.
+        collection = autoDb.getDb()->getCollection(opCtx, systemRoles);
+        if (collection) {
+            IndexCatalog* indexCatalog = collection->getIndexCatalog();
+            invariant(indexCatalog);
+
+            std::vector<IndexDescriptor*> indexes;
+            indexCatalog->findIndexesByKeyPattern(opCtx, v3SystemRolesKeyPattern, false, &indexes);
+            if (indexes.empty()) {
+                try {
+                    generateSystemIndexForExistingCollection(
+                        opCtx, collection, systemRoles, v3SystemRolesIndexSpec);
+                } catch (...) {
+                    return exceptionToStatus();
+                }
             }
         }
     }
 
-    // Ensure that system indexes exist for the sessions collection, if it exists.
-    collection = autoDb.getDb()->getCollection(opCtx, sessionCollectionNamespace);
-    if (collection) {
-        IndexCatalog* indexCatalog = collection->getIndexCatalog();
-        invariant(indexCatalog);
-
-        std::vector<IndexDescriptor*> indexes;
-        indexCatalog->findIndexesByKeyPattern(opCtx, v1SystemSessionsKeyPattern, false, &indexes);
-        if (indexes.empty()) {
-            try {
-                generateSystemIndexForExistingCollection(
-                    opCtx, collection, sessionCollectionNamespace, v1SystemSessionsIndexSpec);
-            } catch (...) {
-                return exceptionToStatus();
+    // Create indexes for system collections in the config db.
+    {
+        AutoGetDb autoDb(opCtx, sessionCollectionNamespace.db(), MODE_X);
+        if (!autoDb.getDb()) {
+            return Status::OK();
+        }
+
+        // Ensure that system indexes exist for the sessions collection, if it exists.
+        auto collection = autoDb.getDb()->getCollection(opCtx, sessionCollectionNamespace);
+        if (collection) {
+            IndexCatalog* indexCatalog = collection->getIndexCatalog();
+            invariant(indexCatalog);
+
+            std::vector<IndexDescriptor*> indexes;
+            indexCatalog->findIndexesByKeyPattern(
+                opCtx, v1SystemSessionsKeyPattern, false, &indexes);
+            if (indexes.empty()) {
+                try {
+                    generateSystemIndexForExistingCollection(
+                        opCtx, collection, sessionCollectionNamespace, v1SystemSessionsIndexSpec);
+                } catch (...) {
+                    return exceptionToStatus();
+                }
             }
         }
     }