Tests to show that ElasticsearchServerExceptions shortcut the retry logic (known errros should fail fast)

Author: Mpdreamz

src/Elasticsearch.Net/Connection/Transport.cs

@@ -311,6 +311,10 @@ private ElasticsearchResponse<T> DoRequest<T>(TransportRequestState<T> requestSt
 					return typedResponse;
 				}
 			}
+			catch (ElasticsearchServerException)
+			{
+				throw;
+			}
 			catch (Exception e)
 			{
 				if (maxRetries == 0 && retried == 0)

src/Tests/Elasticsearch.Net.Tests.Unit/Connection/NoRetryOnServerExceptionTests.cs

@@ -0,0 +1,115 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Autofac.Extras.FakeItEasy;
+using Elasticsearch.Net.Connection;
+using Elasticsearch.Net.ConnectionPool;
+using Elasticsearch.Net.Exceptions;
+using Elasticsearch.Net.Tests.Unit.Stubs;
+using FakeItEasy;
+using FluentAssertions;
+using NUnit.Framework;
+
+namespace Elasticsearch.Net.Tests.Unit.Connection
+{
+	[TestFixture]
+	public class NoRetryOnServerExceptionTests
+	{
+		private MemoryStream CreateServerExceptionResponse(int status, string exceptionType, string exceptionMessage)
+		{
+			var format = @"{{ ""status"": {0}, ""error"" : ""{1}[{2}]"" }}";
+			var bytes = Encoding.UTF8.GetBytes(string.Format(format, status, exceptionType, exceptionMessage));
+			var stream = new MemoryStream(bytes);
+			return stream;
+		}
+
+		[Test]
+		[TestCase(505, "SomeException", "Some Error Message")]
+		[TestCase(505, "", "")]
+		public void IfResponseIsKnowError_DoNotRetry_ThrowServerException(int status, string exceptionType, string exceptionMessage)
+		{
+			var response = CreateServerExceptionResponse(status, exceptionType, exceptionMessage);
+			using (var fake = new AutoFake(callsDoNothing: true))
+			{
+				var connectionPool = new StaticConnectionPool(new[]
+				{
+					new Uri("http://localhost:9200"),
+					new Uri("http://localhost:9201"),
+				});
+				var connectionConfiguration = new ConnectionConfiguration(connectionPool)
+					.ThrowOnElasticsearchServerExceptions()
+					.ExposeRawResponse(false);
+
+				fake.Provide<IConnectionConfigurationValues>(connectionConfiguration);
+				FakeCalls.ProvideDefaultTransport(fake);
+
+				var pingCall = FakeCalls.PingAtConnectionLevel(fake);
+				pingCall.Returns(FakeResponse.Ok(connectionConfiguration));
+
+				var getCall = FakeCalls.GetSyncCall(fake);
+				getCall.Returns(FakeResponse.Any(connectionConfiguration, status, response: response));
+
+				var client = fake.Resolve<ElasticsearchClient>();
+
+				var e = Assert.Throws<ElasticsearchServerException>(()=>client.Info());
+				AssertServerErrorsOnResponse(e, status, exceptionType, exceptionMessage);
+				
+				//make sure a know ElasticsearchServerException does not cause a retry
+				//In this case we want to fail early
+
+				getCall.MustHaveHappened(Repeated.Exactly.Once);
+
+			}
+		}
+
+		[Test]
+		[TestCase(505, "SomeException", "Some Error Message")]
+		[TestCase(505, "", "")]
+		public async void IfResponseIsKnowError_DoNotRetry_ThrowServerException_Async(int status, string exceptionType, string exceptionMessage)
+		{
+			var response = CreateServerExceptionResponse(status, exceptionType, exceptionMessage);
+			using (var fake = new AutoFake(callsDoNothing: true))
+			{
+				var connectionPool = new StaticConnectionPool(new[]
+				{
+					new Uri("http://localhost:9200"),
+					new Uri("http://localhost:9201"),
+				});
+				var connectionConfiguration = new ConnectionConfiguration(connectionPool)
+					.ThrowOnElasticsearchServerExceptions()
+					.ExposeRawResponse(false);
+
+				fake.Provide<IConnectionConfigurationValues>(connectionConfiguration);
+				FakeCalls.ProvideDefaultTransport(fake);
+
+				var pingCall = FakeCalls.PingAtConnectionLevelAsync(fake);
+				pingCall.Returns(FakeResponse.OkAsync(connectionConfiguration));
+
+				var getCall = FakeCalls.GetCall(fake);
+				getCall.Returns(FakeResponse.AnyAsync(connectionConfiguration, status, response: response));
+
+				var client = fake.Resolve<ElasticsearchClient>();
+
+				var e = Assert.Throws<ElasticsearchServerException>(async ()=>await client.InfoAsync());
+				AssertServerErrorsOnResponse(e, status, exceptionType, exceptionMessage);
+
+				//make sure a know ElasticsearchServerException does not cause a retry
+				//In this case we want to fail early
+
+				getCall.MustHaveHappened(Repeated.Exactly.Once);
+
+			}
+		}
+		
+		private static void AssertServerErrorsOnResponse(
+			ElasticsearchServerException serverException, int status, string exceptionType, string exceptionMessage)
+		{
+			serverException.Should().NotBeNull();
+			serverException.ExceptionType.Should().Be(exceptionType);
+			serverException.Message.Should().Be(exceptionMessage);
+			serverException.Status.Should().Be(status);
+		}
+	}
+}

src/Tests/Elasticsearch.Net.Tests.Unit/Elasticsearch.Net.Tests.Unit.csproj

@@ -60,6 +60,7 @@
   <ItemGroup>
     <Compile Include="Connection\BuildInResponseAsyncTests.cs" />
     <Compile Include="Connection\BuildInResponseTests.cs" />
+    <Compile Include="Connection\NoRetryOnServerExceptionTests.cs" />
     <Compile Include="Connection\ElasticsearchServerExceptions.cs" />
     <Compile Include="Connection\NoRetryTests.cs" />
     <Compile Include="Stubs\FakeCalls.cs" />

src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/FakeResponse.cs

@@ -49,18 +49,20 @@ public static ElasticsearchResponse<Stream> Any(
 			IConnectionConfigurationValues config, 
 			int statusCode,
 			string method = "GET",
-			string path = "/")
+			string path = "/",
+			Stream response = null)
 		{
-			return ElasticsearchResponse<Stream>.Create(config, statusCode, method, path, null);
+			return ElasticsearchResponse<Stream>.Create(config, statusCode, method, path, null, response);
 		}
 
 		public static Task<ElasticsearchResponse<Stream>> AnyAsync(
 			IConnectionConfigurationValues config, 
 			int statusCode,
 			string method = "GET",
-			string path = "/")
+			string path = "/",
+			Stream response = null)
 		{
-			return Task.FromResult(ElasticsearchResponse<Stream>.Create(config, statusCode, method, path, null));
+			return Task.FromResult(ElasticsearchResponse<Stream>.Create(config, statusCode, method, path, null, response));
 		}
 	}
 }