post #2753 backport fixes of cancellationtoken being on request data, also backported Node equals fixes from master/5.x

Author: Mpdreamz

src/Elasticsearch.Net/Auditing/AuditEvent.cs

@@ -18,7 +18,7 @@ public enum AuditEvent
 
 		MaxTimeoutReached,
 		MaxRetriesReached,
-		BadRequest
+		BadRequest,
 		CancellationRequested,
 	}
 }

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -191,7 +191,7 @@ public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(
 			try
 			{
 				var request = this.CreateHttpWebRequest(requestData);
-				cancellationToken.Register(()=>request.Abort());
+				requestData.CancellationToken.Register(()=>request.Abort());
 				var data = requestData.PostData;
 
 				if (data != null)

src/Elasticsearch.Net/ConnectionPool/Node.cs

@@ -84,12 +84,10 @@ public Node Clone() =>
 				HttpEnabled = this.HttpEnabled
 			};
 
+		public static bool operator ==(Node left, Node right) =>
+			ReferenceEquals(left, null) ? ReferenceEquals(right, null) : left.Equals(right);
 
-		// ReSharper disable once PossibleNullReferenceException
-		public static bool operator ==(Node left, Node right) => left.Equals(right);
-
-		// ReSharper disable once PossibleNullReferenceException
-		public static bool operator !=(Node left, Node right) => !left.Equals(right);
+		public static bool operator !=(Node left, Node right) => !(left == right);
 
 		public static implicit operator Node(Uri uri) => new Node(uri);
 
@@ -110,5 +108,6 @@ public override bool Equals(object obj)
 		}
 
 		public override int GetHashCode() => this.Uri.GetHashCode();
+
 	}
 }

src/Elasticsearch.Net/Transport/Transport.cs

@@ -8,11 +8,11 @@ namespace Elasticsearch.Net
 	public class Transport<TConnectionSettings> : ITransport<TConnectionSettings>
 		where TConnectionSettings : IConnectionConfigurationValues
 	{
-		//TODO should all of these be public?
+		//TODO should all of these be public?
 		public TConnectionSettings Settings { get; }
-		public IDateTimeProvider DateTimeProvider { get; }
-		public IMemoryStreamFactory MemoryStreamFactory { get; }
-		public IRequestPipelineFactory PipelineProvider { get; }
+		public IDateTimeProvider DateTimeProvider { get; }
+		public IMemoryStreamFactory MemoryStreamFactory { get; }
+		public IRequestPipelineFactory PipelineProvider { get; }
 
 		/// <summary>
 		/// Transport coordinates the client requests over the connection pool nodes and is in charge of falling over on different nodes
@@ -152,11 +152,11 @@ public async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(HttpMeth
 							AuditTrail = pipeline.AuditTrail
 						};
 					}
-					if (cancellationToken.IsCancellationRequested)
-					{
-						pipeline.AuditCancellationRequested();
-						break;
-					}
+					if (requestData.CancellationToken.IsCancellationRequested)
+					{
+						pipeline.AuditCancellationRequested();
+						break;
+					}
 					if (response == null || !response.SuccessOrKnownError) continue;
 					pipeline.MarkAlive(node);
 					break;

src/Tests/Reproduce/GithubIssue2751.cs

@@ -24,7 +24,7 @@ public class GithubIssue2751: IClusterFixture<ReadOnlyCluster>
 		* the response from /project/project/_search to 5 seconds. See this issue's accompanying PR.
 		*/
 
-		//[I]
+		[I]
 		public async Task TimeoutOfRequestReturnsResponse()
 		{
 			var client = TestClient.GetClient(modifySettings: c => c.RequestTimeout(TimeSpan.FromSeconds(2)));
@@ -52,7 +52,7 @@ public async Task TimeoutOfRequestReturnsResponse()
 			//cancelling an async request should behave differently
 			stopwatch.Restart();
 			var ctx = new CancellationTokenSource();
-			var task = client.SearchAsync<Project>(s=>s, ctx.Token);
+			var task = client.SearchAsync<Project>(s=>s.RequestConfiguration(r=>r.CancellationToken(ctx.Token)));
 			await Task.Delay(100);
 			ctx.Cancel();
 			response = await task;
@@ -67,7 +67,7 @@ public async Task TimeoutOfRequestReturnsResponse()
 			response.ApiCall.AuditTrail.Should().Contain(a=> a.Event == AuditEvent.CancellationRequested);
 		}
 
-		//[I]
+		[I]
 		public async Task UserCancellationDoesNotCauseFailOverToNextNode()
 		{
 			//this tests assumes only a single node is running under 9200 and fiddler is set up to artificially delay results
@@ -76,7 +76,7 @@ public async Task UserCancellationDoesNotCauseFailOverToNextNode()
 				modifySettings: c => c.RequestTimeout(TimeSpan.FromSeconds(2)));
 
 			var ctx = new CancellationTokenSource();
-			var task = client.SearchAsync<Project>(s=>s, ctx.Token);
+			var task = client.SearchAsync<Project>(s=>s.RequestConfiguration(r=>r.CancellationToken(ctx.Token)));
 			await Task.Delay(100);
 			ctx.Cancel();
 			var response = await task;