SERVER-36489 Start initial sync oplog fetching from the 'oldest active transaction timestamp'

SERVER-36490 Initial sync should not actually prepare transactions on applying prepareTransaction oplog entries
SERVER-36491 During initial sync, make commitTransaction oplog entries apply the transaction from the prepare oplog entry

1 files changed, 7 insertions, 6 deletions

diff --git a/src/mongo/db/server_transactions_metrics.cpp b/src/mongo/db/server_transactions_metrics.cpp
index 11f6480d887..a46a663e0b1 100644
--- a/src/mongo/db/server_transactions_metrics.cpp
+++ b/src/mongo/db/server_transactions_metrics.cpp
@@ -34,6 +34,7 @@
 #include "mongo/db/commands/server_status.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/operation_context.h"
+#include "mongo/db/repl/optime.h"
 #include "mongo/db/retryable_writes_stats.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/transactions_stats_gen.h"
@@ -295,12 +296,12 @@ void ServerTransactionsMetrics::updateStats(TransactionsStats* stats, OperationC
         ServerTransactionsMetrics::_getOldestOpenUnpreparedReadTimestamp(opCtx));
     // Acquire _mutex before reading _oldestActiveOplogEntryOpTime.
     stdx::lock_guard<stdx::mutex> lm(_mutex);
-    // To avoid compression loss, we have Timestamp(0, 0) be the default value if no oldest active
-    // transaction optime is stored.
-    Timestamp oldestActiveOplogEntryTimestamp = (_oldestActiveOplogEntryOpTime != boost::none)
-        ? _oldestActiveOplogEntryOpTime->getTimestamp()
-        : Timestamp();
-    stats->setOldestActiveOplogEntryTimestamp(oldestActiveOplogEntryTimestamp);
+    // To avoid compression loss, we use the null OpTime if no oldest active transaction optime is
+    // stored.
+    repl::OpTime oldestActiveOplogEntryOpTime = (_oldestActiveOplogEntryOpTime != boost::none)
+        ? _oldestActiveOplogEntryOpTime.get()
+        : repl::OpTime();
+    stats->setOldestActiveOplogEntryOpTime(oldestActiveOplogEntryOpTime);
 }
 
 void ServerTransactionsMetrics::clearOpTimes() {