From 48f8b49dc30cc2485c6c1f3db31b723258fcbf39 Mon Sep 17 00:00:00 2001
From: Andy Schwerin <schwerin@mongodb.com>
Date: Wed, 30 Mar 2016 13:53:40 -0700
Subject: SERVER-23425 Correctly track inserts and deletes to migrating chunks.

---
 src/mongo/db/repl/oplog.cpp | 6 +++---
 1 file 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,
-- 
cgit v1.2.1