summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/working_set_common.cpp
diff options
context:
space:
mode:
authorLouis Williams <louis.williams@mongodb.com>2020-11-11 09:23:44 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-11-11 15:31:05 +0000
commitf5ad04df2255518e16048e09dcf2baeff64bd7a8 (patch)
tree229b7622d69f0e915248b7117dfa758a59836a1c /src/mongo/db/exec/working_set_common.cpp
parentc71607de7b74e72b188abc2c11fca31ba009dbf4 (diff)
downloadmongo-f5ad04df2255518e16048e09dcf2baeff64bd7a8.tar.gz
Revert "SERVER-48002 Do not enforce DataCorruptionDetected assertion when ignoring prepare conflicts"
This reverts commit 523247d096a796c15c911370e622a3614411a25b.
Diffstat (limited to 'src/mongo/db/exec/working_set_common.cpp')
-rw-r--r--src/mongo/db/exec/working_set_common.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mongo/db/exec/working_set_common.cpp b/src/mongo/db/exec/working_set_common.cpp
index 33a9f6074e7..c6083642478 100644
--- a/src/mongo/db/exec/working_set_common.cpp
+++ b/src/mongo/db/exec/working_set_common.cpp
@@ -82,14 +82,9 @@ bool WorkingSetCommon::fetch(OperationContext* opCtx,
// The record referenced by this index entry is gone. If the query yielded some time after
// we first examined the index entry, then it's likely that the record was deleted while we
// were yielding. However, if the snapshot id hasn't changed since the index lookup, then
- // there could not have been a yield, meaning the document we are searching for has been
- // deleted.
- // One possibility is that the record was deleted by a prepared transaction, but if we are
- // not ignoring prepare conflicts, then this definitely indicates an error.
+ // there could not have been a yield, and the only explanation is corruption.
std::vector<IndexKeyDatum>::iterator keyDataIt;
if (member->getState() == WorkingSetMember::RID_AND_IDX &&
- opCtx->recoveryUnit()->getPrepareConflictBehavior() ==
- PrepareConflictBehavior::kEnforce &&
(keyDataIt = std::find_if(member->keyData.begin(),
member->keyData.end(),
[currentSnapshotId = opCtx->recoveryUnit()->getSnapshotId()](