Merge branch 'develop' into 1.x

Author: russcam

src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandler.cs

@@ -109,7 +109,7 @@ private ElasticsearchResponse<T> ReturnTypedResponse<T>(
 				return this.StreamToTypedResponse<T>(streamResponse, requestState, bytes);
 
 			// If error read error 
-			error = GetErrorFromStream<T>(streamResponse.Response);
+			error = GetErrorFromStream<T>(streamResponse.Response, streamResponse.HttpStatusCode ?? 0);
 			var typedResponse = ElasticsearchResponse.CloneFrom<T>(streamResponse, default(T));
 			this.SetStringOrByteResult(typedResponse, bytes);
 			return typedResponse;

src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerAsync.cs

@@ -131,7 +131,7 @@ private Task<ReadResponse<T>> ReturnTypedResponse<T>(ElasticsearchResponse<Strea
 				var typedResponse = ElasticsearchResponse.CloneFrom<T>(streamResponse, default(T));
 				if (!isValidResponse)
 				{
-					response.Error = GetErrorFromStream<T>(gotStream.Result);
+					response.Error = GetErrorFromStream<T>(gotStream.Result, streamResponse.HttpStatusCode ?? 0);
 					this.SetStringOrByteResult(typedResponse, response.Bytes);
 					if (gotStream.Result != null) gotStream.Result.Close();
 					response.Response = typedResponse;

src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerBase.cs

@@ -217,11 +217,20 @@ protected void SetByteResult(ElasticsearchResponse<byte[]> response, byte[] rawR
 			response.Response = rawResponse;
 		}
 
-		protected ElasticsearchServerError GetErrorFromStream<T>(Stream stream)
+		protected ElasticsearchServerError GetErrorFromStream<T>(Stream stream, int httpStatusCode = 0)
 		{
 			try
 			{
 				var e = this._serializer.Deserialize<OneToOneServerException>(stream);
+				if (e?.status == 0)
+				{
+					// Service unavailable isn't reported as a regular error, and
+					// thus won't be serialized as such. This workaround improves
+					// the error message for these errors.
+					e.status = httpStatusCode;
+					if (e.status == 503 && e.error.IsNullOrEmpty())
+						e.error = "ServiceUnavailableException[Service Unavaliable. Try again later.]";
+				}
 				return ElasticsearchServerError.Create(e);
 			}
 			// ReSharper disable once EmptyGeneralCatchClause

src/Tests/Nest.Tests.Integration/Exceptions/ElasticsearchExceptionTests.cs

@@ -1,6 +1,7 @@
 using System;
+using System.Diagnostics;
 using System.Net;
-using System.Runtime.Remoting.Channels;
+using System.Threading.Tasks;
 using Elasticsearch.Net;
 using Elasticsearch.Net.ConnectionPool;
 using Elasticsearch.Net.Exceptions;
@@ -179,7 +180,7 @@ public void ConnectionPool_DoesNotThrowOnServerExceptions_ThrowsMaxRetryExceptio
 		}
 
 		[Test]
-		public async void ConnectionPool_DoesNotThrowOnServerExceptions_ThrowsMaxRetryException_OnDeadNodes_Async()
+		public async Task ConnectionPool_DoesNotThrowOnServerExceptions_ThrowsMaxRetryException_OnDeadNodes_Async()
 		{
 			var uris = new []
 			{
@@ -232,7 +233,7 @@ public void ConnectionPool_ThrowOnServerExceptions_ThrowsElasticsearchServerExce
 		}
 
 		[Test]
-		public async void ConnectionPool_ThrowOnServerExceptions_ThrowsElasticsearchServerException_Async()
+		public async Task ConnectionPool_ThrowOnServerExceptions_ThrowsElasticsearchServerException_Async()
 		{
 			var uris = new []
 			{
@@ -262,5 +263,48 @@ public async void ConnectionPool_ThrowOnServerExceptions_ThrowsElasticsearchServ
 				Assert.Fail("Did not expect exception of type {0} to be caught", e.GetType().Name);
 			}
 		}
+
+		[Test]
+		// see https://github.com/elastic/elasticsearch/issues/9126 and https://github.com/elastic/elasticsearch-net/issues/1596
+		public void ElasticsearchServerException_With_ServiceUnavailable_On_Response_NotValid_And_HttpStatusCode_503()
+		{
+			var uris = new[]
+			{
+				ElasticsearchConfiguration.CreateBaseUri(9200),
+				ElasticsearchConfiguration.CreateBaseUri(9200),
+				ElasticsearchConfiguration.CreateBaseUri(9200),
+			};
+			var connectionPool = new StaticConnectionPool(uris);
+			var client = new ElasticClient(new ConnectionSettings(connectionPool)
+				.ThrowOnElasticsearchServerExceptions()
+				.SetTimeout(1000)
+			);
+
+			var stopWatch = Stopwatch.StartNew();
+
+			try
+			{
+				var index = ElasticsearchConfiguration.NewUniqueIndexName();
+
+				while (stopWatch.Elapsed < TimeSpan.FromSeconds(5))
+				{
+					client.CreateIndex(index);
+					client.Count(d => d.Index(index));
+					client.DeleteIndex(index);
+				}
+
+				Assert.Fail("Expected exception to be thrown");
+			}
+			catch (ElasticsearchServerException e)
+			{
+				e.Status.Should().Be(503);
+				e.ExceptionType.Should().Contain("ServiceUnavailableException");
+				e.Message.Should().Contain("Service Unavaliable. Try again later.");
+			}
+			catch (Exception e)
+			{
+				Assert.Fail("Did not expect exception of type {0} to be caught", e.GetType().Name);
+			}
+		}
 	}
 }