Merge pull request #2078 from elastic/fix/skip-http-disabled-nodes-from-sniff

fix #1957 skip http disabled nodes from sniff

Author: gmarz

src/Elasticsearch.Net/ConnectionPool/Node.cs

@@ -23,21 +23,24 @@ public Node(Uri uri)
 		/// <summary> When set this signals the transport that a ping before first usage would be wise</summary>
 		public bool IsResurrected { get; set; }
 
+		/// <summary>Whether HTTP is enabled on the node or not</summary>
+		public bool HttpEnabled { get; set; } = true;
+
 		/// <summary>Indicates whether this node holds data, defaults to true when unknown/unspecified</summary>
 		public bool HoldsData { get; set; }
 
 		/// <summary>Indicates whether this node is master eligible, defaults to true when unknown/unspecified</summary>
 		public bool MasterEligible { get; set; }
 
 		/// <summary>The id of the node, defaults to null when unknown/unspecified</summary>
-		public string Id { get; set; } 
+		public string Id { get; set; }
 
 		/// <summary>The name of the node, defaults to null when unknown/unspecified</summary>
-		public string Name { get; set; } 
+		public string Name { get; set; }
 
 		/// <summary> The number of failed attempts trying to use this node, resets when a node is marked alive</summary>
 		public int FailedAttempts { get; private set; }
-		
+
 		/// <summary> When marked dead this reflects the date that the node has to be taken out of rotation till</summary>
 		public DateTime DeadUntil { get; private set; }
 
@@ -56,7 +59,7 @@ public void MarkAlive()
 			this.FailedAttempts = 0;
 			this.IsAlive = true;
 			this.IsResurrected = false;
-			this.DeadUntil = default(DateTime); 
+			this.DeadUntil = default(DateTime);
 		}
 
 		public Uri CreatePath(string path) => new Uri(this.Uri, path).Purify();
@@ -90,7 +93,7 @@ public bool Equals(Node other)
 			if (ReferenceEquals(this, other)) return true;
 			return this.Uri == other.Uri;
 		}
-		
+
 		public override bool Equals(object obj)
 		{
 			if (ReferenceEquals(null, obj)) return false;

src/Elasticsearch.Net/Transport/Sniff/SniffResponse.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace Elasticsearch.Net
@@ -14,20 +15,22 @@ internal class SniffResponse
 
 		public IEnumerable<Node> ToNodes(bool forceHttp = false)
 		{
-			foreach (var kv in nodes)
+			foreach (var kv in nodes.Where(n=>n.Value.HttpEnabled))
 			{
 				yield return new Node(this.ParseToUri(kv.Value.http_address, forceHttp))
 				{
 					Name = kv.Value.name,
 					Id = kv.Key,
 					MasterEligible = kv.Value.MasterEligible,
-					HoldsData = kv.Value.HoldsData,
+					HoldsData = kv.Value.HoldsData,
+					HttpEnabled = kv.Value.HttpEnabled,
 				};
 			}
 		}
 
 		private Uri ParseToUri(string httpAdress, bool forceHttp)
 		{
+			if (httpAdress.IsNullOrEmpty()) return null;
 			var suffix = forceHttp ? "s" : string.Empty;
 			var match = AddressRe.Match(httpAdress);
 			if (!match.Success) throw new Exception($"Can not parse http_address: {httpAdress} to Uri");
@@ -56,6 +59,15 @@ internal class SniffNode
 
 		internal bool MasterEligible => !((this.settings?.ContainsKey("node.master")).GetValueOrDefault(false) && Convert.ToBoolean(this.settings["node.master"]) == false);
 		internal bool HoldsData => !((this.settings?.ContainsKey("node.data")).GetValueOrDefault(false) && Convert.ToBoolean(this.settings["node.data"]) == false);
+		internal bool HttpEnabled
+		{
+			get
+			{
+				if (this.settings == null) return true;
+				if (!this.settings.ContainsKey("http.enabled")) return true;
+				return Convert.ToBoolean(this.settings["http.enabled"]) ;
+			}
+		}
 	}
 
 }

src/Tests/ClientConcepts/ConnectionPooling/Sniffing/RoleDetection.doc.cs

@@ -77,6 +77,39 @@ public async Task DetectsDataNodes()
 			};
 			await audit.TraceStartup();
 		}
+
+		[U, SuppressMessage("AsyncUsage", "AsyncFixer001:Unnecessary async/await usage", Justification = "Its a test")]
+		public async Task SkipsNodesThatDisableHttp()
+		{
+			var audit = new Auditor(() => Framework.Cluster
+				.Nodes(10)
+				.Sniff(s => s.SucceedAlways()
+					.Succeeds(Always, Framework.Cluster.Nodes(8).StoresNoData(9200, 9201, 9202).HttpDisabled(9201))
+				)
+				.SniffingConnectionPool()
+				.AllDefaults()
+			)
+			{
+				AssertPoolBeforeCall = (pool) =>
+				{
+					pool.Should().NotBeNull();
+					pool.Nodes.Should().HaveCount(10);
+					pool.Nodes.Where(n => n.HoldsData).Should().HaveCount(10);
+					pool.Nodes.Where(n => n.HttpEnabled).Should().HaveCount(10);
+					pool.Nodes.Should().OnlyContain(n => n.Uri.Host == "localhost");
+				},
+
+				AssertPoolAfterCall = (pool) =>
+				{
+					pool.Should().NotBeNull();
+					pool.Nodes.Should().HaveCount(7, "we filtered the node that stores no data");
+					pool.Nodes.Should().NotContain(n=>n.Uri.Port == 9201);
+					pool.Nodes.Where(n => n.HoldsData).Should().HaveCount(5);
+				}
+			};
+			await audit.TraceStartup();
+		}
+
 		[U, SuppressMessage("AsyncUsage", "AsyncFixer001:Unnecessary async/await usage", Justification = "Its a test")]
 		public async Task DetectsFqdn()
 		{

src/Tests/Framework/MockResponses/SniffingResponse.cs

@@ -30,14 +30,16 @@ private static IDictionary<string, object> SniffResponseNodes(IEnumerable<Node>
 			select new { id, name, node })
 			.ToDictionary(kv => kv.id, kv => CreateNodeResponse(kv.node, kv.name, randomFqdn));
 
+		private static Random Random = new Random(1337);
 		private static object CreateNodeResponse(Node node, string name, bool randomFqdn)
 		{
 			var fqdn = randomFqdn ? $"fqdn{node.Uri.Port}/" : "";
+
 			var nodeResponse = new
 			{
 				name = name,
 				transport_address = $"127.0.0.1:{node.Uri.Port + 1000}]",
-				http_address = $"{fqdn}127.0.0.1:{node.Uri.Port}",
+				http_address = node.HttpEnabled ? $"{fqdn}127.0.0.1:{node.Uri.Port}" : null,
 				host = Guid.NewGuid().ToString("N").Substring(0, 8),
 				ip = "127.0.0.1",
 				version = TestClient.Configuration.ElasticsearchVersion,
@@ -49,6 +51,7 @@ private static object CreateNodeResponse(Node node, string name, bool randomFqdn
 			};
 			if (!node.MasterEligible) nodeResponse.settings.Add("node.master", false);
 			if (!node.HoldsData) nodeResponse.settings.Add("node.data", false);
+			if (!node.HttpEnabled) nodeResponse.settings.Add("http.enabled", false);
 			return nodeResponse;
 		}
 

src/Tests/Framework/VirtualClustering/VirtualCluster.cs

@@ -16,7 +16,6 @@ public class VirtualCluster
 
 		private bool _sniffReturnsFqdn = false;
 		public bool SniffShouldReturnFqnd => _sniffReturnsFqdn;
-			
 
 		public IReadOnlyList<Node> Nodes => _nodes;
 
@@ -44,6 +43,12 @@ public VirtualCluster StoresNoData(params int[] ports)
 				node.HoldsData = false;
 			return this;
 		}
+		public VirtualCluster HttpDisabled(params int[] ports)
+		{
+			foreach (var node in this._nodes.Where(n => ports.Contains(n.Uri.Port)))
+				node.HttpEnabled = false;
+			return this;
+		}
 
 		public VirtualCluster Ping(Func<PingRule, IRule> selector)
 		{
@@ -86,4 +91,4 @@ public SealedVirtualCluster StickyConnectionPool(Func<IList<Node>, IEnumerable<N
         }
     }
 
-}
+}