summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2016-03-30 13:53:40 -0700
committerAndy Schwerin <schwerin@mongodb.com>2016-03-31 15:21:41 -0400
commit3ce338f6fc95322141bbf35f982513a831bb74ca (patch)
treed7144b829c6f416746c7bbb91bf7318e66467cfc
parentc16c21d21316d6b32ff8a798ccff03d17b19119d (diff)
downloadmongo-3ce338f6fc95322141bbf35f982513a831bb74ca.tar.gz
SERVER-23425 Correctly track inserts and deletes to migrating chunks.
-rw-r--r--src/mongo/db/repl/oplog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 620e103d4c7..5f8c58abfd9 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -398,7 +398,7 @@ static void logOpInternal(OperationContext* txn,
BSONObj* patt,
bool* b,
bool fromMigrate,
- bool isDeleteInMigratingChunk) {
+ bool isMaybeInActiveChunk) {
if (getGlobalReplicationCoordinator()->isReplEnabled()) {
_logOp(txn, opstr, ns, 0, obj, patt, b, fromMigrate);
}
@@ -408,7 +408,7 @@ static void logOpInternal(OperationContext* txn,
// rollback-safe logOp listeners
//
getGlobalAuthorizationManager()->logOp(txn, opstr, ns, obj, patt, b);
- logOpForSharding(txn, opstr, ns, obj, patt, fromMigrate || !isDeleteInMigratingChunk);
+ logOpForSharding(txn, opstr, ns, obj, patt, fromMigrate || !isMaybeInActiveChunk);
logOpForDbHash(txn, ns);
if (strstr(ns, ".system.js")) {
Scope::storedFuncMod(txn);
@@ -426,7 +426,7 @@ void logOp(OperationContext* txn,
severe() << "logOp called with opstr == 'd'; use logDeleteOp instead";
invariant(*opstr != 'd');
}
- logOpInternal(txn, opstr, ns, obj, patt, b, fromMigrate, false);
+ logOpInternal(txn, opstr, ns, obj, patt, b, fromMigrate, true);
}
void logDeleteOp(OperationContext* txn,