SERVER-36025: Remove restart catalog command guard to re-establish the oplog pointer.

`DBHolder::closeAll` will no longer leave the catalog in an inconsistent state. If
it fails, the oplog pointer is now guaranteed to be untouched and otherwise valid.

(cherry picked from commit b813bb3e7bacc146695f42750f4ac2809a1a45cd)

1 files changed, 0 insertions, 12 deletions

diff --git a/src/mongo/db/commands/restart_catalog_command.cpp b/src/mongo/db/commands/restart_catalog_command.cpp
index 8847e04eca9..d7958defdbc 100644
--- a/src/mongo/db/commands/restart_catalog_command.cpp
+++ b/src/mongo/db/commands/restart_catalog_command.cpp
@@ -103,21 +103,9 @@ public:
             }
         }
 
-        auto restoreOplogPointerGuard = MakeGuard([opCtx]() {
-            auto db = DatabaseHolder::getDatabaseHolder().openDb(
-                opCtx, NamespaceString::kRsOplogNamespace.db());
-            invariant(db, "failed to reopen database after early exit from restartCatalog");
-
-            auto oplog = db->getCollection(opCtx, NamespaceString::kRsOplogNamespace);
-            invariant(oplog, "failed to get oplog after early exit from restartCatalog");
-            repl::establishOplogCollectionForLogging(opCtx, oplog);
-        });
-
         log() << "Closing database catalog";
         auto state = catalog::closeCatalog(opCtx);
 
-        restoreOplogPointerGuard.Dismiss();
-
         log() << "Reopening database catalog";
         catalog::openCatalog(opCtx, state);