Revert "SERVER-74714 Make drop-pending ident log message less noisy"

This reverts commit 161833d.

Author: louiswilliams

jstests/noPassthrough/collection_catalog_two_phase_drops.js

@@ -83,8 +83,8 @@ checkLog.containsJson(primary, 6825301, {
 assert.commandWorked(db.adminCommand({appendOplogNote: 1, data: {msg: "advance timestamp"}}));
 assert.commandWorked(db.adminCommand({fsync: 1}));
 
-// "The ident was successfully dropped".
-checkLog.containsJson(primary, 6776600, {
+// Completing drop for ident.
+checkLog.containsJson(primary, 22237, {
     ident: function(ident) {
         return ident == xIndexUri;
     }
@@ -133,13 +133,13 @@ checkLog.containsJson(primary, 6825300, {
 assert.commandWorked(db.adminCommand({appendOplogNote: 1, data: {msg: "advance timestamp"}}));
 assert.commandWorked(db.adminCommand({fsync: 1}));
 
-// "The ident was successfully dropped".
-checkLog.containsJson(primary, 6776600, {
+// Completing drop for ident.
+checkLog.containsJson(primary, 22237, {
     ident: function(ident) {
         return ident == collUri;
     }
 });
-checkLog.containsJson(primary, 6776600, {
+checkLog.containsJson(primary, 22237, {
     ident: function(ident) {
         return ident == idIndexUri;
     }

jstests/noPassthrough/drop_pending_retry.js

@@ -18,7 +18,6 @@ const rst = new ReplSetTest({
         setParameter: {
             // Set the history window to zero to explicitly control the oldest timestamp.
             minSnapshotHistoryWindowInSeconds: 0,
-            logComponentVerbosity: tojson({storage: 1}),
         }
     }
 });
@@ -52,25 +51,20 @@ assert.commandWorked(db.getCollection("toWrite").insert({x: 1}));
 // Take a checkpoint to advance the checkpoint timestamp.
 assert.commandWorked(db.adminCommand({fsync: 1}));
 
-// Tests that the table drops are retried when the drop pending reaper runs. Once for the collection
-// and once for the index.
-checkLog.containsWithAtLeastCount(primary, "Drop-pending ident is still in use", 2);
+// Tests that the table drops are retried each time the drop pending reaper runs until they succeed.
+// We wait for 5 retries here. 5 for the collection table and 5 for the index table.
+checkLog.containsWithAtLeastCount(primary, "Drop-pending ident is still in use", 2 * 5);
 
 // Let the table drops succeed.
 assert.commandWorked(primary.adminCommand({configureFailPoint: "WTDropEBUSY", mode: "off"}));
 
-// Perform another write and another checkpoint to advance the checkpoint timestamp, triggering
-// the reaper.
-assert.commandWorked(db.getCollection("toWrite").insert({x: 1}));
-assert.commandWorked(db.adminCommand({fsync: 1}));
-
-// "The ident was successfully dropped".
-checkLog.containsJson(primary, 6776600, {
+// Completing drop for ident
+checkLog.containsJson(primary, 22237, {
     ident: function(ident) {
         return ident == collUri;
     }
 });
-checkLog.containsJson(primary, 6776600, {
+checkLog.containsJson(primary, 22237, {
     ident: function(ident) {
         return ident == indexUri;
     }
@@ -80,4 +74,4 @@ assert.commandWorked(
     primary.adminCommand({configureFailPoint: "pauseCheckpointThread", mode: "off"}));
 
 rst.stopSet();
-}());
+}());

src/mongo/db/storage/storage_engine_impl.cpp

@@ -1230,18 +1230,7 @@ void StorageEngineImpl::checkpoint(OperationContext* opCtx) {
 void StorageEngineImpl::_onMinOfCheckpointAndOldestTimestampChanged(const Timestamp& timestamp) {
     // No drop-pending idents present if getEarliestDropTimestamp() returns boost::none.
     if (auto earliestDropTimestamp = _dropPendingIdentReaper.getEarliestDropTimestamp()) {
-
-        auto checkpoint = _engine->getCheckpointTimestamp();
-        auto oldest = _engine->getOldestTimestamp();
-
-        // We won't try to drop anything unless we know it is both safe to drop (older than the
-        // oldest timestamp) and present in a checkpoint. Otherwise, the drop will fail, and we'll
-        // keep attempting a drop for each new `timestamp`. Note that this is not required for
-        // correctness and is only done to avoid unnecessary work and spamming the logs when we
-        // actually have nothing to do. Additionally, these values may have both advanced since
-        // `timestamp` was calculated, but this is not expected to be common and does not affect
-        // correctness.
-        if (checkpoint >= *earliestDropTimestamp && oldest >= *earliestDropTimestamp) {
+        if (timestamp >= *earliestDropTimestamp) {
             LOGV2(22260,
                   "Removing drop-pending idents with drop timestamps before timestamp",
                   "timestamp"_attr = timestamp);