pr

Author: sanych-sun

src/MongoDB.Driver/OperationExecutor.cs

@@ -50,10 +50,10 @@ public TResult ExecuteReadOperation<TResult>(
             Ensure.IsNotNull(session, nameof(session));
             ThrowIfDisposed();
 
-            var cancellationContext = options.ToOperationContext(cancellationToken);
+            var operationContext = options.ToOperationContext(cancellationToken);
             var readPreference = options.GetEffectiveReadPreference(session);
             using var binding = CreateReadBinding(session, readPreference, allowChannelPinning);
-            return operation.Execute(cancellationContext, binding);
+            return operation.Execute(operationContext, binding);
         }
 
         public async Task<TResult> ExecuteReadOperationAsync<TResult>(
@@ -68,10 +68,10 @@ public async Task<TResult> ExecuteReadOperationAsync<TResult>(
             Ensure.IsNotNull(session, nameof(session));
             ThrowIfDisposed();
 
-            var cancellationContext = options.ToOperationContext(cancellationToken);
+            var operationContext = options.ToOperationContext(cancellationToken);
             var readPreference = options.GetEffectiveReadPreference(session);
             using var binding = CreateReadBinding(session, readPreference, allowChannelPinning);
-            return await operation.ExecuteAsync(cancellationContext, binding).ConfigureAwait(false);
+            return await operation.ExecuteAsync(operationContext, binding).ConfigureAwait(false);
         }
 
         public TResult ExecuteWriteOperation<TResult>(
@@ -86,9 +86,9 @@ public TResult ExecuteWriteOperation<TResult>(
             Ensure.IsNotNull(session, nameof(session));
             ThrowIfDisposed();
 
-            var cancellationContext = options.ToOperationContext(cancellationToken);
+            var operationContext = options.ToOperationContext(cancellationToken);
             using var binding = CreateReadWriteBinding(session, allowChannelPinning);
-            return operation.Execute(cancellationContext, binding);
+            return operation.Execute(operationContext, binding);
         }
 
         public async Task<TResult> ExecuteWriteOperationAsync<TResult>(
@@ -103,9 +103,9 @@ public async Task<TResult> ExecuteWriteOperationAsync<TResult>(
             Ensure.IsNotNull(session, nameof(session));
             ThrowIfDisposed();
 
-            var cancellationContext = options.ToOperationContext(cancellationToken);
+            var operationContext = options.ToOperationContext(cancellationToken);
             using var binding = CreateReadWriteBinding(session, allowChannelPinning);
-            return await operation.ExecuteAsync(cancellationContext, binding).ConfigureAwait(false);
+            return await operation.ExecuteAsync(operationContext, binding).ConfigureAwait(false);
         }
 
         public IClientSessionHandle StartImplicitSession()

tests/MongoDB.Driver.Tests/Core/Clusters/LoadBalancedClusterTests.cs

@@ -387,10 +387,10 @@ public async Task SelectServer_should_be_cancelled_by_cancellationToken(
                 Exception exception;
                 using (var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromMilliseconds(100)))
                 {
-                    var cancellationContext = new OperationContext(Timeout.InfiniteTimeSpan, cancellationTokenSource.Token);
+                    var operationContext = new OperationContext(Timeout.InfiniteTimeSpan, cancellationTokenSource.Token);
                     exception = async ?
-                        await Record.ExceptionAsync(() => subject.SelectServerAsync(cancellationContext, Mock.Of<IServerSelector>())) :
-                        Record.Exception(() => subject.SelectServer(cancellationContext, Mock.Of<IServerSelector>()));
+                        await Record.ExceptionAsync(() => subject.SelectServerAsync(operationContext, Mock.Of<IServerSelector>())) :
+                        Record.Exception(() => subject.SelectServer(operationContext, Mock.Of<IServerSelector>()));
                 }
 
                 exception.Should().BeOfType<OperationCanceledException>();