summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gottlieb <daniel.gottlieb@mongodb.com>2019-05-21 12:44:00 -0400
committerDaniel Gottlieb <daniel.gottlieb@mongodb.com>2019-05-21 13:07:37 -0400
commitba2e818de44c9a331ce09a624780a2bd841cf6e4 (patch)
treed0cfdaf74a0ffd8305ee8ec27feaba9b6ed3ab90
parentd8b5ce3e76f394b6525822574a32dc033b58cf0d (diff)
downloadmongo-r3.4.21.tar.gz
SERVER-41213: Trigger a write conflict in unique, non-partial index build code path.r3.4.21-rc0r3.4.21
(cherry picked from commit 3372bc595d099392e422d735074ba687efd6634b)
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
index ecf3c183996..4ddbde52460 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
@@ -1116,6 +1116,7 @@ void WiredTigerIndexUnique::_unindex(WT_CURSOR* c,
}
int ret = WT_OP_CHECK(c->remove(c));
if (ret == WT_NOTFOUND) {
+ triggerWriteConflictAtPoint(c);
return;
}
invariantWTOK(ret);