summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
authorBenety Goh <benety@mongodb.com>2018-11-20 15:23:44 -0500
committerBenety Goh <benety@mongodb.com>2018-11-20 15:23:44 -0500
commitb6ed88dc8f2036ead73b6ff3806092301ae70e22 (patch)
treece2b6f2053692aa098e06b0673f57d0419968c97 /src/mongo
parent6704d85ca26ebf6db2577831b1411dd6ae88325c (diff)
downloadmongo-b6ed88dc8f2036ead73b6ff3806092301ae70e22.tar.gz
SERVER-37763 make MultiIndexBlock work with LockerNoop
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/db/catalog/multi_index_block_impl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/catalog/multi_index_block_impl.cpp b/src/mongo/db/catalog/multi_index_block_impl.cpp
index 417b6ea0ff2..f6394fa4af0 100644
--- a/src/mongo/db/catalog/multi_index_block_impl.cpp
+++ b/src/mongo/db/catalog/multi_index_block_impl.cpp
@@ -327,7 +327,7 @@ void failPointHangDuringBuild(FailPoint* fp, StringData where, const BSONObj& do
}
Status MultiIndexBlockImpl::insertAllDocumentsInCollection() {
- invariant(!_opCtx->lockState()->inAWriteUnitOfWork());
+ invariant(_opCtx->lockState()->isNoop() || !_opCtx->lockState()->inAWriteUnitOfWork());
// Refrain from persisting any multikey updates as a result from building the index. Instead,
// accumulate them in the `MultikeyPathTracker` and do the write as part of the update that
@@ -519,7 +519,7 @@ Status MultiIndexBlockImpl::doneInserting(std::vector<BSONObj>* dupKeysInserted)
Status MultiIndexBlockImpl::_doneInserting(std::set<RecordId>* dupRecords,
std::vector<BSONObj>* dupKeysInserted) {
- invariant(!_opCtx->lockState()->inAWriteUnitOfWork());
+ invariant(_opCtx->lockState()->isNoop() || !_opCtx->lockState()->inAWriteUnitOfWork());
for (size_t i = 0; i < _indexes.size(); i++) {
if (_indexes[i].bulk == NULL)
continue;