summaryrefslogtreecommitdiff
path: root/src/mongo/db/ops
diff options
context:
space:
mode:
authorNick Zolnierz <nicholas.zolnierz@mongodb.com>2019-01-11 19:27:28 -0500
committerNick Zolnierz <nicholas.zolnierz@mongodb.com>2019-01-11 19:27:28 -0500
commitd19bd0c883a338e4f443399c928700381c682e32 (patch)
tree52ffe6437c9ca5fa5e0b53d9dcf118aba28c8878 /src/mongo/db/ops
parent587ad0e175cb501e378f4aeaf37199dbb28dd011 (diff)
downloadmongo-d19bd0c883a338e4f443399c928700381c682e32.tar.gz
Revert "SERVER-38191 Enforce restriction on namespace for failpoints in write_ops"
This reverts commit 587ad0e175cb501e378f4aeaf37199dbb28dd011.
Diffstat (limited to 'src/mongo/db/ops')
-rw-r--r--src/mongo/db/ops/write_ops_exec.cpp25
1 files changed, 8 insertions, 17 deletions
diff --git a/src/mongo/db/ops/write_ops_exec.cpp b/src/mongo/db/ops/write_ops_exec.cpp
index bf46d4fe3eb..23072437272 100644
--- a/src/mongo/db/ops/write_ops_exec.cpp
+++ b/src/mongo/db/ops/write_ops_exec.cpp
@@ -355,14 +355,12 @@ bool insertBatchAndHandleErrors(OperationContext* opCtx,
&hangDuringBatchInsert,
opCtx,
"hangDuringBatchInsert",
- [wholeOp]() {
- log()
- << "batch insert - hangDuringBatchInsert fail point enabled for namespace "
- << wholeOp.getNamespace() << ". Blocking "
- "until fail point is disabled.";
+ []() {
+ log() << "batch insert - hangDuringBatchInsert fail point enabled. Blocking "
+ "until fail point is disabled.";
},
- true, // Check for interrupt periodically.
- wholeOp.getNamespace());
+ true // Check for interrupt periodically.
+ );
if (MONGO_FAIL_POINT(failAllInserts)) {
uasserted(ErrorCodes::InternalError, "failAllInserts failpoint active!");
@@ -570,18 +568,11 @@ static SingleWriteResult performSingleUpdateOp(OperationContext* opCtx,
boost::optional<AutoGetCollection> collection;
while (true) {
- const auto checkForInterrupt = false;
CurOpFailpointHelpers::waitWhileFailPointEnabled(
- &hangDuringBatchUpdate,
- opCtx,
- "hangDuringBatchUpdate",
- [ns]() {
- log() << "batch update - hangDuringBatchUpdate fail point enabled for nss " << ns
- << ". Blocking until "
+ &hangDuringBatchUpdate, opCtx, "hangDuringBatchUpdate", [opCtx]() {
+ log() << "batch update - hangDuringBatchUpdate fail point enabled. Blocking until "
"fail point is disabled.";
- },
- checkForInterrupt,
- ns);
+ });
if (MONGO_FAIL_POINT(failAllUpdates)) {
uasserted(ErrorCodes::InternalError, "failAllUpdates failpoint active!");