SERVER-38356 added functionality to forbid dropping the oplog, modified tests to get around Evergreen issue

1 files changed, 16 insertions, 5 deletions

diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp
index ba34046a899..291c5c36112 100644
--- a/src/mongo/db/commands/dbcommands.cpp
+++ b/src/mongo/db/commands/dbcommands.cpp
@@ -233,11 +233,22 @@ public:
                            BSONObjBuilder& result) {
         const NamespaceString nsToDrop(CommandHelpers::parseNsCollectionRequired(dbname, cmdObj));
 
-        if ((repl::ReplicationCoordinator::get(opCtx)->getReplicationMode() !=
-             repl::ReplicationCoordinator::modeNone) &&
-            nsToDrop.isOplog()) {
-            errmsg = "can't drop live oplog while replicating";
-            return false;
+        if (nsToDrop.isOplog()) {
+            if (repl::ReplicationCoordinator::get(opCtx)->isReplEnabled()) {
+                errmsg = "can't drop live oplog while replicating";
+                return false;
+            }
+
+            auto storageEngine = opCtx->getServiceContext()->getStorageEngine();
+            invariant(storageEngine);
+            if (storageEngine->supportsRecoveryTimestamp()) {
+                // We use the method supportsRecoveryTimestamp() to detect whether we are using
+                // the WiredTiger storage engine, which is currently only storage engine that
+                // supports the replSetResizeOplog command.
+                errmsg =
+                    "can't drop oplog on storage engines that support replSetResizeOplog command";
+                return false;
+            }
         }
 
         uassertStatusOK(