summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/oplog.cpp
diff options
context:
space:
mode:
authorDavid Storch <david.storch@10gen.com>2014-10-21 15:37:06 -0400
committerDavid Storch <david.storch@10gen.com>2014-10-21 17:43:50 -0400
commit11ad1edebfafea650ff00912bdf7a3a48dede144 (patch)
tree6b8c4aa4fc88bad42ff5cb8a1888fe5708d070cb /src/mongo/db/repl/oplog.cpp
parenta1a2e24b34d818cfed86b3ad5eb01d62bc375eaa (diff)
downloadmongo-11ad1edebfafea650ff00912bdf7a3a48dede144.tar.gz
SERVER-15760 internally issued update and delete requests should not yield
This change adds a default yield policy of YIELD_MANUAL in the UpdateRequest and DeleteRequest, only setting it to YIELD_AUTO as needed. This prevents yielding in internal plans used for repl while inside a WriteUnitOfWork.
Diffstat (limited to 'src/mongo/db/repl/oplog.cpp')
-rw-r--r--src/mongo/db/repl/oplog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 5d72d19647a..dede9d0f475 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -736,7 +736,7 @@ namespace repl {
else if ( *opType == 'd' ) {
opCounters->gotDelete();
if ( opType[1] == 0 )
- deleteObjects(txn, db, ns, o, /*justOne*/ valueB);
+ deleteObjects(txn, db, ns, o, PlanExecutor::YIELD_MANUAL, /*justOne*/ valueB);
else
verify( opType[1] == 'b' ); // "db" advertisement
}