From 11eff2c56f44404d3d1ad4c26449507610a0a7e5 Mon Sep 17 00:00:00 2001
From: Luke Pearson <luke.pearson@mongodb.com>
Date: Wed, 30 Sep 2020 14:05:56 +1000
Subject: SERVER-43457 Removing truncate workaround and related TODO

---
 .../db/storage/wiredtiger/wiredtiger_record_store.cpp  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
index d6338be1b1d..3439a78a406 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
@@ -1295,18 +1295,12 @@ int64_t WiredTigerRecordStore::_cappedDeleteAsNeeded_inlock(OperationContext* op
                 ret = session->truncate(session, nullptr, truncateStart, truncateEnd, nullptr);
             }
 
-            if (ret == ENOENT || ret == WT_NOTFOUND) {
-                // TODO we should remove this case once SERVER-17141 is resolved
-                LOGV2(22397, "Soft failure truncating capped collection. Will try again later.");
-                docsRemoved = 0;
-            } else {
-                invariantWTOK(ret);
-                _changeNumRecords(opCtx, -docsRemoved);
-                _increaseDataSize(opCtx, -sizeSaved);
-                wuow.commit();
-                // Save the key for the next round
-                _cappedFirstRecord = firstRemainingId;
-            }
+            invariantWTOK(ret);
+            _changeNumRecords(opCtx, -docsRemoved);
+            _increaseDataSize(opCtx, -sizeSaved);
+            wuow.commit();
+            // Save the key for the next round
+            _cappedFirstRecord = firstRemainingId;
         }
     } catch (const WriteConflictException&) {
         opCtx->releaseRecoveryUnit();
-- 
cgit v1.2.1