SERVER-36825 Wrap SideTransaction oplog entry writes in write conflict retry loops

1 files changed, 9 insertions, 6 deletions

diff --git a/src/mongo/db/op_observer_impl.cpp b/src/mongo/db/op_observer_impl.cpp
index a8d7d6ddec1..34709f9bc19 100644
--- a/src/mongo/db/op_observer_impl.cpp
+++ b/src/mongo/db/op_observer_impl.cpp
@@ -1,4 +1,3 @@
-
 /**
  *    Copyright (C) 2018-present MongoDB, Inc.
  *
@@ -1028,12 +1027,16 @@ void OpObserverImpl::onTransactionPrepare(OperationContext* opCtx, const OplogSl
     {
         TransactionParticipant::SideTransactionBlock sideTxn(opCtx);
 
-        // Writes to the oplog only require a Global intent lock.
-        Lock::GlobalLock globalLock(opCtx, MODE_IX);
+        writeConflictRetry(
+            opCtx, "onTransactionPrepare", NamespaceString::kRsOplogNamespace.ns(), [&] {
+
+                // Writes to the oplog only require a Global intent lock.
+                Lock::GlobalLock globalLock(opCtx, MODE_IX);
 
-        WriteUnitOfWork wuow(opCtx);
-        logApplyOpsForTransaction(opCtx, stmts, prepareOpTime);
-        wuow.commit();
+                WriteUnitOfWork wuow(opCtx);
+                logApplyOpsForTransaction(opCtx, stmts, prepareOpTime);
+                wuow.commit();
+            });
     }
 }