Fix cluster state sniffing failures due to new _nodes response

Closes #2339

Author: gmarz

src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs

@@ -301,7 +301,7 @@ private void ThrowBadAuthPipelineExceptionWhenNeeded(IApiCallDetails response)
 				throw new PipelineException(PipelineFailure.BadAuthentication, response.OriginalException) { Response = response };
 		}
 
-		public string SniffPath => "_nodes/_all/settings?flat_settings&timeout=" + this.PingTimeout.ToTimeUnit();
+		public string SniffPath => "_nodes/http,settings?flat_settings&timeout=" + this.PingTimeout.ToTimeUnit();
 
 		public IEnumerable<Node> SniffNodes => this._connectionPool
 			.CreateView((e, n)=> { using (new Auditable(e, this.AuditTrail, this._dateTimeProvider) { Node = n }) {} })

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

@@ -11,63 +11,65 @@ internal class SniffResponse
 		private static Regex AddressRe { get; } = new Regex(@"^((?<fqdn>[^/]+)/)?(?<ip>[^:]+):(?<port>\d+)$");
 
 		public string cluster_name { get; set; }
-		public Dictionary<string, SniffNode> nodes { get; set; }
+		public Dictionary<string, NodeInfo> nodes { get; set; }
 
 		public IEnumerable<Node> ToNodes(bool forceHttp = false)
 		{
-			foreach (var kv in nodes.Where(n=>n.Value.HttpEnabled))
+			foreach (var kv in nodes.Where(n => n.Value.HttpEnabled))
 			{
-				yield return new Node(this.ParseToUri(kv.Value.http_address, forceHttp))
+				yield return new Node(this.ParseToUri(kv.Value.http?.bound_address.FirstOrDefault(), forceHttp))
 				{
 					Name = kv.Value.name,
 					Id = kv.Key,
 					MasterEligible = kv.Value.MasterEligible,
 					HoldsData = kv.Value.HoldsData,
-					HttpEnabled = kv.Value.HttpEnabled,
 				};
 			}
 		}
 
-		private Uri ParseToUri(string httpAdress, bool forceHttp)
+		private Uri ParseToUri(string boundAddress, bool forceHttp)
 		{
-			if (httpAdress.IsNullOrEmpty()) return null;
+			if (boundAddress.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");
+			var match = AddressRe.Match(boundAddress);
+			if (!match.Success) throw new Exception($"Can not parse bound_address: {boundAddress} to Uri");
 
 			var fqdn = match.Groups["fqdn"].Value?.Trim();
 			var ip = match.Groups["ip"].Value?.Trim();
 			var port = match.Groups["port"].Value?.Trim();
 			var host = !fqdn.IsNullOrEmpty() ? fqdn : ip;
 
 			return new Uri($"http{suffix}://{host}:{port}");
-
 		}
-
 	}
 
-	internal class SniffNode
+	internal class NodeInfo
 	{
 		public string name { get; set; }
 		public string transport_address { get; set; }
-		public string http_address { get; set; }
 		public string host { get; set; }
 		public string ip { get; set; }
 		public string version { get; set; }
-		public string build { get; set; }
+		public string build_hash { get; set; }
+		public IList<string> roles { get; set; }
+		public NodeInfoHttp http { get; set; }
 		public IDictionary<string, string> settings { get; set; }
 
-		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 MasterEligible => this.roles?.Contains("master") ?? false;
+		internal bool HoldsData => this.roles?.Contains("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"]) ;
+				if (this.settings != null && this.settings.ContainsKey("http.enabled"))
+					return Convert.ToBoolean(this.settings["http.enabled"]);
+				return http != null;
 			}
 		}
 	}
 
+	internal class NodeInfoHttp
+	{
+		public IList<string> bound_address { get; set; }
+	}
 }

src/Tests/ClientConcepts/ConnectionPooling/BuildingBlocks/RequestPipelines.doc.cs

@@ -250,7 +250,7 @@ public void SetsSniffPathUsingToTimespan()
 			var sniffingPipeline = CreatePipeline(uris =>
 				new SniffingConnectionPool(uris, dateTimeProvider: dateTime), dateTimeProvider: dateTime) as RequestPipeline;
 
-			sniffingPipeline.SniffPath.Should().Be("_nodes/_all/settings?flat_settings&timeout=2s");
+			sniffingPipeline.SniffPath.Should().Be("_nodes/http,settings?flat_settings&timeout=2s");
 		}
 	}
 }

src/Tests/Framework/VirtualClustering/MockResponses/SniffingResponse.cs

@@ -39,19 +39,28 @@ private static object CreateNodeResponse(Node node, string name, bool randomFqdn
 			{
 				name = name,
 				transport_address = $"127.0.0.1:{node.Uri.Port + 1000}]",
-				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.Version,
-				build = Guid.NewGuid().ToString("N").Substring(0, 8),
-				settings = new Dictionary<string, object> {
+				build_hash = Guid.NewGuid().ToString("N").Substring(0, 8),
+				roles = new List<string>(),
+				http = node.HttpEnabled ? new
+				{
+					bound_address = new []
+					{
+						$"{fqdn}127.0.0.1:{node.Uri.Port}"
+					}
+				} : null,
+				settings = new Dictionary<string, object>
+				{
 					{ "cluster.name", ClusterName },
-					{ "name", name },
+					{ "node.name", name }
 				}
 			};
-			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);
+			if (node.MasterEligible) nodeResponse.roles.Add("master");
+			if (node.HoldsData) nodeResponse.roles.Add("data");
+			if (!node.HttpEnabled)
+				nodeResponse.settings.Add("http.enabled", false);
 			return nodeResponse;
 		}
 

src/Tests/Framework/VirtualClustering/VirtualClusterConnection.cs

@@ -36,7 +36,7 @@ public void UpdateCluster(VirtualCluster cluster)
 			}
 		}
 
-		public bool IsSniffRequest(RequestData requestData) => requestData.Path.StartsWith("_nodes/_all/settings", StringComparison.Ordinal);
+		public bool IsSniffRequest(RequestData requestData) => requestData.Path.StartsWith("_nodes/http,settings", StringComparison.Ordinal);
 		public bool IsPingRequest(RequestData requestData) => requestData.Path == "/" && requestData.Method == HttpMethod.HEAD;
 
 		public override ElasticsearchResponse<TReturn> Request<TReturn>(RequestData requestData)

src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: i
+mode: u
 # the elasticsearch version that should be started
 # Can be a snapshot version of sonatype or "latest" to get the latest snapshot of sonatype
 elasticsearch_version: 5.0.0-rc1