can now specify custom ping timeout, dead timeout, max dead timeout

Author: Mpdreamz

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

@@ -46,7 +46,7 @@ public void DeadNodesAreNotVisited()
 				);
 				A.CallTo(()=>dateTimeProvider.AliveTime(A<Uri>._, A<int>._))
 					.Returns(new DateTime());
-				A.CallTo(() => dateTimeProvider.DeadTime(A<Uri>._, A<int>._))
+				A.CallTo(() => dateTimeProvider.DeadTime(A<Uri>._, A<int>._, A<int?>._, A<int?>._))
 					.Returns(DateTime.UtcNow.AddMinutes(1));
 				//make sure the transport layer uses a different datetimeprovider
 				fake.Provide<IDateTimeProvider>(new DateTimeProvider());
@@ -106,7 +106,7 @@ public void DeadNodesAreNotVisited()
 		}
 
 		[Test]
-		public  async void DeadNodesAreNotVisited_Async()
+		public async void DeadNodesAreNotVisited_Async()
 		{
 			using (var fake = new AutoFake())
 			{
@@ -128,7 +128,7 @@ public  async void DeadNodesAreNotVisited_Async()
 				);
 				A.CallTo(()=>dateTimeProvider.AliveTime(A<Uri>._, A<int>._))
 					.Returns(new DateTime());
-				A.CallTo(() => dateTimeProvider.DeadTime(A<Uri>._, A<int>._))
+				A.CallTo(() => dateTimeProvider.DeadTime(A<Uri>._, A<int>._, A<int?>._, A<int?>._))
 					.Returns(DateTime.UtcNow.AddMinutes(1));
 				//make sure the transport layer uses a different datetimeprovider
 				fake.Provide<IDateTimeProvider>(new DateTimeProvider());

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

@@ -197,7 +197,7 @@ public void AllNodesWillBeMarkedDead()
 				var calls = _uris.Select(u =>
 					A.CallTo(()=> dateTimeProvider.DeadTime(
 						A<Uri>.That.Matches(uu=>uu.Port == u.Port),
-						A<int>._
+						A<int>._, A<int?>._, A<int?>._
 					))).ToList();
 
 				//all the fake mark dead calls return 60 seconds into the future
@@ -234,7 +234,7 @@ public void IfAConnectionComesBackToLifeOnItsOwnItShouldBeMarked()
 				//Setting up a datetime provider so that can track dead/alive marks
 				var dateTimeProvider = fake.Resolve<IDateTimeProvider>();
 				A.CallTo(() => dateTimeProvider.Now()).Returns(DateTime.UtcNow);
-				var markDeadCall = A.CallTo(() => dateTimeProvider.DeadTime(A<Uri>._, A<int>._));
+				var markDeadCall = A.CallTo(() => dateTimeProvider.DeadTime(A<Uri>._, A<int>._, A<int?>._, A<int?>._));
 				var markAliveCall = A.CallTo(() => dateTimeProvider.AliveTime(A<Uri>._, A<int>._));
 				markDeadCall.Returns(DateTime.UtcNow.AddSeconds(60));
 				markAliveCall.Returns(new DateTime());
@@ -292,9 +292,9 @@ public void IfAllButOneConnectionDiesSubsequentRequestsMustUseTheOneAliveConnect
 				var dateTimeProvider = fake.Resolve<IDateTimeProvider>();
 				A.CallTo(() => dateTimeProvider.Now()).Returns(DateTime.UtcNow);
 				var markOthersDeadCall = A.CallTo(() => dateTimeProvider
-					.DeadTime(A<Uri>.That.Not.Matches(u=>u.Port == 9203), A<int>._));
+					.DeadTime(A<Uri>.That.Not.Matches(u=>u.Port == 9203), A<int>._, A<int?>._, A<int?>._));
 				var markLastDead = A.CallTo(() => dateTimeProvider
-					.DeadTime(A<Uri>.That.Matches(u=>u.Port == 9203), A<int>._));
+					.DeadTime(A<Uri>.That.Matches(u=>u.Port == 9203), A<int>._, A<int?>._, A<int?>._));
 				var markOthersAliveCall = A.CallTo(() => dateTimeProvider
 					.AliveTime(A<Uri>.That.Not.Matches(u=>u.Port == 9203), A<int>._));
 				var markLastAlive = A.CallTo(() => dateTimeProvider

src/Elasticsearch.Net/Connection/ConnectionConfiguration.cs

@@ -32,6 +32,9 @@ public class ConnectionConfiguration<T> : IConnectionConfigurationValues
 		//public string Host { get; private set; }
 		//public int Port { get; private set; }
 		public int Timeout { get; private set; }
+		public int? PingTimeout { get; private set; }
+		public int? DeadTimeout { get; private set; }
+		public int? MaxDeadTimeout { get; private set; }
 		public string ProxyUsername { get; private set; }
 		public string ProxyPassword { get; private set; }
 		public string ProxyAddress { get; private set; }
@@ -119,6 +122,37 @@ public T SetTimeout(int timeout)
 			return (T) this;
 		}
 
+		/// <summary>
+		/// This is a separate timeout for Ping() requests. A ping should fail as fast as possible.
+		/// </summary>
+		/// <param name="timeout">The ping timeout in milliseconds defaults to 50</param>
+		public T SetPingTimeout(int timeout)
+		{
+			this.PingTimeout = timeout;
+			return (T) this;
+		}
+
+		/// <summary>
+		/// Sets the default dead timeout factor when a node has been marked dead.
+		/// </summary>
+		/// <remarks>Some connection pools may use a flat timeout whilst others take this factor and increase it exponentially</remarks>
+		/// <param name="timeout"></param>
+		public T SetDeadTimeout(int timeout)
+		{
+			this.DeadTimeout = timeout;
+			return (T) this;
+		}
+
+		/// <summary>
+		/// Sets the maximum time a node can be marked dead. 
+		/// Different implementations of IConnectionPool may choose a different default.
+		/// </summary>
+		/// <param name="timeout">The timeout in milliseconds</param>
+		public T SetMaxDeadTimeout(int timeout)
+		{
+			this.MaxDeadTimeout = timeout;
+			return (T) this;
+		}
 		/// <summary>
 		/// Semaphore asynchronous connections automatically by giving
 		/// it a maximum concurrent connections. 

src/Elasticsearch.Net/Connection/IConnectionConfigurationValues.cs

@@ -13,6 +13,9 @@ public interface IConnectionConfigurationValues
 		//string Host { get; }
 		//int Port { get; }
 		int Timeout { get; }
+		int? PingTimeout { get; }
+		int? DeadTimeout { get; }
+		int? MaxDeadTimeout { get; }
 		int? MaxRetries { get; }
 		string ProxyAddress { get; }
 		string ProxyUsername { get; }
@@ -38,6 +41,7 @@ public interface IConnectionConfigurationValues
 		/// </summary>
 		TimeSpan? SniffInformationLifeSpan { get; }
 
+
 		/// <summary>
 		/// Append these query string parameters automatically to every request
 		/// </summary>

src/Elasticsearch.Net/Connection/Transport.cs

@@ -116,9 +116,10 @@ private ElasticsearchResponse RetryRequest(
 			var maxRetries = this.GetMaximumRetries();
 			var exceptionMessage = "Unable to perform request: '{0} {1}' on any of the nodes after retrying {2} times."
 				.F( method, path, retried);
-			this._connectionPool.MarkDead(baseUri);
+			this._connectionPool.MarkDead(baseUri, this._configurationValues.DeadTimeout, this._configurationValues.MaxDeadTimeout);
 			if (this._configurationValues.SniffsOnConnectionFault && retried == 0)
 				this.Sniff();
+
 			if (retried < maxRetries)
 			{
 				return this.DoRequest(method, path, data, null, ++retried, initialSeed);
@@ -181,7 +182,7 @@ private Task<ElasticsearchResponse> RetryRequestAsync(
 			var maxRetries = this.GetMaximumRetries();
 			var exceptionMessage = "Unable to perform request: '{0} {1}' on any of the nodes after retrying {2} times."
 				.F( method, path, retried);
-			this._connectionPool.MarkDead(baseUri);
+			this._connectionPool.MarkDead(baseUri, this._configurationValues.DeadTimeout, this._configurationValues.MaxDeadTimeout);
 			if (this._configurationValues.SniffsOnConnectionFault && retried == 0)
 				this.Sniff();
 			if (retried < maxRetries)

src/Elasticsearch.Net/ConnectionPool/IConnectionPool.cs

@@ -20,7 +20,7 @@ public interface IConnectionPool
 		/// <summary>
 		/// Mark the specified Uri as dead
 		/// </summary>
-		void MarkDead(Uri uri);
+		void MarkDead(Uri uri, int? deadTimeout = null, int? maxDeadtimeout = null);
 
 		/// <summary>
 		/// Bring the specified uri back to life.

src/Elasticsearch.Net/ConnectionPool/SingleNodeConnectionPool.cs

@@ -24,7 +24,7 @@ public Uri GetNext(int? initialSeed, out int seed)
 			return _uri;
 		}
 
-		public void MarkDead(Uri uri)
+		public void MarkDead(Uri uri, int? deadTimeout = null, int? maxDeadTimeout = null)
 		{
 
 		}

src/Elasticsearch.Net/ConnectionPool/SniffingConnectionPool.cs

@@ -75,12 +75,12 @@ public override void MarkAlive(Uri uri)
 			}
 		}
 
-		public override void MarkDead(Uri uri)
+		public override void MarkDead(Uri uri, int? deadTimeout, int? maxDeadTimeout)
 		{
 			try
 			{
 				this._readerWriter.EnterReadLock();
-				base.MarkDead(uri);
+				base.MarkDead(uri, deadTimeout, maxDeadTimeout);
 			}
 			finally
 			{

src/Elasticsearch.Net/ConnectionPool/StaticConnectionPool.cs

@@ -67,14 +67,14 @@ public virtual Uri GetNext(int? initialSeed, out int seed)
 			return this._nodeUris[i]; 
 		}
 
-		public virtual void MarkDead(Uri uri)
+		public virtual void MarkDead(Uri uri, int? deadTimeout, int? maxDeadTimeout)
 		{	
 			EndpointState state = null;
 			if (!this._uriLookup.TryGetValue(uri, out state))
 				return;
 			lock(state)
 			{
-				state.date = this._dateTimeProvider.DeadTime(uri, state._attempts);
+				state.date = this._dateTimeProvider.DeadTime(uri, state._attempts, deadTimeout, maxDeadTimeout);
 			}
 		}
 

src/Elasticsearch.Net/Providers/DateTimeProvider.cs

@@ -1,18 +1,22 @@
 using System;
+using Elasticsearch.Net.Connection;
 
 namespace Elasticsearch.Net.Providers
 {
 	public class DateTimeProvider : IDateTimeProvider
 	{
+
 		public virtual DateTime Now()
 		{
 			return DateTime.UtcNow;
 		}
 
-		public virtual DateTime DeadTime(Uri uri, int attempts)
+		public virtual DateTime DeadTime(Uri uri, int attempts, int? timeoutFactor = null, int? maxDeadTimeout = null)
 		{
-			var seconds = Math.Min(60 * 2 * Math.Pow(2, (attempts * 0.5 - 1)), 60 * 30);
-			return DateTime.UtcNow.AddSeconds(seconds);
+			var timeout = timeoutFactor.GetValueOrDefault(60 * 1000);
+			var maxTimeout = maxDeadTimeout.GetValueOrDefault(60 * 1000 * 30);
+			var seconds = Math.Min(timeout * 2 * Math.Pow(2, (attempts * 0.5 - 1)), maxTimeout);
+			return DateTime.UtcNow.AddMilliseconds(seconds);
 		}
 
 		public virtual DateTime AliveTime(Uri uri, int attempts)

src/Elasticsearch.Net/Providers/IDateTimeProvider.cs

@@ -5,7 +5,7 @@ namespace Elasticsearch.Net.Providers
 	public interface IDateTimeProvider
 	{
 		DateTime Now();
-		DateTime DeadTime(Uri uri, int attempts);
+		DateTime DeadTime(Uri uri, int attempts, int? timeoutFactor = null, int? maxDeadTimeout = null);
 		DateTime AliveTime(Uri uri, int attempts);
 	}
 }