Skip to content

Commit 171b8fc

Browse files
committed
Ping() should listen to .ConnectTimeout() request setting when set
1 parent 3e1fc81 commit 171b8fc

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/Elasticsearch.Net/Connection/Transport.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ public Transport(
6464

6565
private bool Ping(ITransportRequestState requestState)
6666
{
67-
var pingTimeout = this.Settings.PingTimeout.GetValueOrDefault(50);
67+
var pingTimeout = this.Settings.PingTimeout.GetValueOrDefault(200);
68+
pingTimeout = requestState.RequestConfiguration != null
69+
? requestState.RequestConfiguration.ConnectTimeout.GetValueOrDefault(pingTimeout)
70+
: pingTimeout;
6871
var requestOverrides = new RequestConfiguration
6972
{
7073
ConnectTimeout = pingTimeout,
@@ -96,7 +99,10 @@ private bool Ping(ITransportRequestState requestState)
9699

97100
private Task<bool> PingAsync(ITransportRequestState requestState)
98101
{
99-
var pingTimeout = this.Settings.PingTimeout.GetValueOrDefault(50);
102+
var pingTimeout = this.Settings.PingTimeout.GetValueOrDefault(200);
103+
pingTimeout = requestState.RequestConfiguration != null
104+
? requestState.RequestConfiguration.ConnectTimeout.GetValueOrDefault(pingTimeout)
105+
: pingTimeout;
100106
var requestOverrides = new RequestConfiguration
101107
{
102108
ConnectTimeout = pingTimeout,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public void ConnectionPool_SingleNode_PingExceptionThrowsMaxRetry()
121121
{
122122
var result = client.Search<ElasticsearchProject>(s => s.MatchAll());
123123
result.IsValid.Should().BeFalse();
124+
client.RootNodeInfo(r => r.RequestConfiguration(c => c.ConnectTimeout(2000)));
124125
});
125126
e.Should().NotBeNull();
126127
}

0 commit comments

Comments
 (0)