SERVER-5725 Mark relevant code points.

5 files changed, 8 insertions, 3 deletions

diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp
index f26c1df2e8c..c762668863e 100644
--- a/src/mongo/db/clientcursor.cpp
+++ b/src/mongo/db/clientcursor.cpp
@@ -282,6 +282,7 @@ namespace mongo {
                  * In that case we need to advance until we get to the next distinct record or EOF.
                  * SERVER-4154
                  * SERVER-5198
+                 * But see SERVER-5725.
                  */
                 c->advance();
             }
diff --git a/src/mongo/db/cursor.h b/src/mongo/db/cursor.h
index 2ffa4da02c1..926d032805a 100644
--- a/src/mongo/db/cursor.h
+++ b/src/mongo/db/cursor.h
@@ -77,6 +77,8 @@ namespace mongo {
      *     runOtherOps();
      *     cursor->checkLocation();
      *
+     * But see SERVER-5725.
+     *
      * A Cursor may rely on additional callbacks not listed above to relocate its position after a
      * write.
      */
diff --git a/src/mongo/db/dbhelpers.cpp b/src/mongo/db/dbhelpers.cpp
index 59d42580d53..bac90eab2cb 100644
--- a/src/mongo/db/dbhelpers.cpp
+++ b/src/mongo/db/dbhelpers.cpp
@@ -247,7 +247,8 @@ namespace mongo {
                 callback->goingToDelete( cc->current() );
 
             cc->advance();
-            // SERVER-5198 Additional advancement is unnecessary for a single btree cursor.
+            // SERVER-5198 Additional advancement is unnecessary for a single btree cursor, and see
+            // SERVER-5725.
             c->prepareToTouchEarlierIterate();
 
             logOp( "d" , ns.c_str() , rloc.obj()["_id"].wrap() , 0 , 0 , fromMigrate );
diff --git a/src/mongo/db/ops/delete.cpp b/src/mongo/db/ops/delete.cpp
index a89bd390fc6..2d0b001d722 100644
--- a/src/mongo/db/ops/delete.cpp
+++ b/src/mongo/db/ops/delete.cpp
@@ -103,7 +103,7 @@ namespace mongo {
             if ( ! match )
                 continue;
 
-            // SERVER-5198 Advance past the document to be modified.
+            // SERVER-5198 Advance past the document to be modified, but see SERVER-5725.
             while( cc->ok() && rloc == cc->currLoc() ) {
                 cc->advance();
             }
diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp
index 8c992519a52..948c312df18 100644
--- a/src/mongo/db/ops/update.cpp
+++ b/src/mongo/db/ops/update.cpp
@@ -324,7 +324,8 @@ namespace mongo {
                         if ( autoDedup && seenObjects.count( loc ) ) {
                             continue;
                         }
-                        // SERVER-5198 Advance past the document to be modified.
+                        // SERVER-5198 Advance past the document to be modified, but see
+                        // SERVER-5725.
                         while( c->ok() && loc == c->currLoc() ) {
                             c->advance();
                         }