diff options
author | Pavi Vetriselvan <pvselvan@umich.edu> | 2019-04-01 13:42:11 -0400 |
---|---|---|
committer | Pavi Vetriselvan <pvselvan@umich.edu> | 2019-04-01 14:05:19 -0400 |
commit | e433a5aee915568cf73b05e89597903855ed1952 (patch) | |
tree | 6c05ba3dab362405e8d07cc5bf65ea86003ddbbf /src/mongo/db/transaction_metrics_observer.h | |
parent | e96547906836a12d76b7a1591a0028b1fff8cb79 (diff) | |
download | mongo-e433a5aee915568cf73b05e89597903855ed1952.tar.gz |
Revert "SERVER-35811 disallow committing at the prepareTimestamp and pin stable TS before oldest uncommitted TS"
This reverts commit b58420e57a2149c350ebf82815fe708850402296 and 33ac1afd4079e04d12554f9b79d1ab07426caf59.
Diffstat (limited to 'src/mongo/db/transaction_metrics_observer.h')
-rw-r--r-- | src/mongo/db/transaction_metrics_observer.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mongo/db/transaction_metrics_observer.h b/src/mongo/db/transaction_metrics_observer.h index cbb00d21fd9..2634e56728f 100644 --- a/src/mongo/db/transaction_metrics_observer.h +++ b/src/mongo/db/transaction_metrics_observer.h @@ -70,12 +70,10 @@ public: /** * Updates relevant metrics when a transaction commits. Also removes this transaction's oldest * oplog entry OpTime from the oldestActiveOplogEntryOpTimes set if it is not boost::none. - * Finally, updates an entry in oldestNonMajorityCommittedOpTimes to include its commit OpTime. */ void onCommit(ServerTransactionsMetrics* serverTransactionsMetrics, TickSource* tickSource, boost::optional<repl::OpTime> oldestOplogEntryOpTime, - boost::optional<repl::OpTime> commitOpTime, Top* top, bool wasPrepared); @@ -86,13 +84,12 @@ public: void onAbort(ServerTransactionsMetrics* serverTransactionsMetrics, TickSource* tickSource, boost::optional<repl::OpTime> oldestOplogEntryOpTime, - boost::optional<repl::OpTime> abortOpTime, Top* top, bool wasPrepared); /** - * Adds the prepareOpTime, which is currently the Timestamp of the first oplog entry written by - * an active transaction, to the oldestActiveOplogEntryTS set. + * Adds the prepareOpTime, which is currently the OpTime of the first oplog entry written + * by an active transaction, to the oldestActiveOplogEntryOpTimes set. */ void onPrepare(ServerTransactionsMetrics* serverTransactionsMetrics, repl::OpTime prepareOpTime, @@ -138,7 +135,6 @@ private: void _onAbortActive(ServerTransactionsMetrics* serverTransactionsMetrics, TickSource* tickSource, boost::optional<repl::OpTime> oldestOplogEntryOpTime, - boost::optional<repl::OpTime> abortOpTime, Top* top, bool wasPrepared); |