Revert "Revert "Revert "SERVER-30894 Implement command for transferring session information during migration"""

This reverts commit aaa0c96532ba6a8ea9146e4298c6bf1cc6b27f9e.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/mongo/db/ops/write_ops_retryability_test.cpp b/src/mongo/db/ops/write_ops_retryability_test.cpp
index a50c51eba58..f3415ae2427 100644
--- a/src/mongo/db/ops/write_ops_retryability_test.cpp
+++ b/src/mongo/db/ops/write_ops_retryability_test.cpp
@@ -273,6 +273,23 @@ TEST_F(FindAndModifyRetryability, NestedUpsert) {
     ASSERT_BSONOBJ_EQ(BSON("x" << 1), result.getValue());
 }
 
+TEST_F(FindAndModifyRetryability, ErrorIfRequestIsUpsertButOplogIsUpdate) {
+    auto request = FindAndModifyRequest::makeUpdate(kNs, BSONObj(), BSONObj());
+    request.setUpsert(true);
+
+    Timestamp imageTs(120, 3);
+    repl::OplogEntry noteOplog(
+        repl::OpTime(imageTs, 1), 0, repl::OpTypeEnum::kNoop, kNs, BSON("x" << 1 << "z" << 1));
+
+    insertOplogEntry(noteOplog);
+
+    repl::OplogEntry oplog(
+        repl::OpTime(), 0, repl::OpTypeEnum::kUpdate, kNs, BSON("x" << 1), BSON("y" << 1));
+    oplog.setPreImageTs(imageTs);
+
+    ASSERT_THROWS(parseOplogEntryForFindAndModify(opCtx(), request, oplog), AssertionException);
+}
+
 TEST_F(FindAndModifyRetryability, AttemptingToRetryUpsertWithUpdateWithoutUpsertErrors) {
     auto request = FindAndModifyRequest::makeUpdate(kNs, BSONObj(), BSONObj());
     request.setUpsert(false);