CSHARP-5014: Failed test: MongoDB.Driver.Tests.Specifications.transactions_convenient_api.tests.transaction-options.json_withTransaction_explicit_transaction_options_override_client_options (#1367)

Author: sanych-sun

tests/MongoDB.Driver.Tests/Specifications/Runner/MongoClientJsonDrivenSessionsTestRunner.cs

@@ -103,7 +103,12 @@ protected void KillAllSessions()
         protected IClientSessionHandle StartSession(IMongoClient client, BsonDocument test, string sessionKey)
         {
             var options = ParseSessionOptions(test, sessionKey);
-            return client.StartSession(options);
+            var session = client.StartSession(options);
+            if (LastKnownClusterTime != null)
+            {
+                session.WrappedCoreSession.AdvanceClusterTime(LastKnownClusterTime);
+            }
+            return session;
         }
 
         // private methods

tests/MongoDB.Driver.Tests/Specifications/Runner/MongoClientJsonDrivenTestRunnerBase.cs

@@ -74,6 +74,8 @@ public abstract class MongoClientJsonDrivenTestRunnerBase : LoggableTestClass
 
         protected IServer _failPointServer = null;
 
+        protected BsonDocument LastKnownClusterTime { get; set; }
+
         // public constructors
         public MongoClientJsonDrivenTestRunnerBase(ITestOutputHelper testOutputHelper)
             : base(testOutputHelper)
@@ -218,8 +220,11 @@ protected virtual void CreateCollection(IMongoClient client, string databaseName
         {
             Logger.LogDebug("Creating collection {0} in {1} db", databaseName, collectionName);
 
+            var session = client.StartSession();
             var database = client.GetDatabase(databaseName).WithWriteConcern(WriteConcern.WMajority);
-            database.CreateCollection(collectionName);
+            database.CreateCollection(session, collectionName);
+
+            LastKnownClusterTime = session.ClusterTime;
         }
 
         protected virtual MongoClient CreateClientForTestSetup()
@@ -288,13 +293,21 @@ protected virtual void InsertData(IMongoClient client, string databaseName, stri
 
             if (shared.Contains(DataKey))
             {
+                BsonDocument lastServerTime = null;
                 var documents = shared[DataKey].AsBsonArray.Cast<BsonDocument>().ToList();
+
                 if (documents.Count > 0)
                 {
+                    var session = client.StartSession();
+
                     var database = client.GetDatabase(databaseName);
                     var collection = database.GetCollection<BsonDocument>(collectionName).WithWriteConcern(WriteConcern.WMajority);
-                    collection.InsertMany(documents);
+                    collection.InsertMany(session, documents);
+
+                    lastServerTime = session.ClusterTime;
                 }
+
+                LastKnownClusterTime = lastServerTime ?? LastKnownClusterTime;
             }
         }