SERVER-33309 SERVER-33310 Handle WT_PREPARE_CONFLICT. Add methods in

WiredTigerSessionCache to wait and notify on prepared units of work.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index 447ae7a6d34..5c514390704 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -574,6 +574,10 @@ string OpDebug::report(Client* client,
         s << " keysDeleted:" << keysDeleted;
     }
 
+    if (prepareReadConflicts > 0) {
+        s << " prepareReadConflicts:" << prepareReadConflicts;
+    }
+
     if (writeConflicts > 0) {
         s << " writeConflicts:" << writeConflicts;
     }
@@ -661,6 +665,10 @@ void OpDebug::append(const CurOp& curop,
         b.appendNumber("keysDeleted", keysDeleted);
     }
 
+    if (prepareReadConflicts > 0) {
+        b.appendNumber("prepareReadConflicts", prepareReadConflicts);
+    }
+
     if (writeConflicts > 0) {
         b.appendNumber("writeConflicts", writeConflicts);
     }