File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed
Elasticsearch.Net/Connection
Tests/Nest.Tests.Integration/Exceptions Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -64,7 +64,10 @@ public Transport(
64
64
65
65
private bool Ping ( ITransportRequestState requestState )
66
66
{
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 ;
68
71
var requestOverrides = new RequestConfiguration
69
72
{
70
73
ConnectTimeout = pingTimeout ,
@@ -96,7 +99,10 @@ private bool Ping(ITransportRequestState requestState)
96
99
97
100
private Task < bool > PingAsync ( ITransportRequestState requestState )
98
101
{
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 ;
100
106
var requestOverrides = new RequestConfiguration
101
107
{
102
108
ConnectTimeout = pingTimeout ,
Original file line number Diff line number Diff line change @@ -121,6 +121,7 @@ public void ConnectionPool_SingleNode_PingExceptionThrowsMaxRetry()
121
121
{
122
122
var result = client . Search < ElasticsearchProject > ( s => s . MatchAll ( ) ) ;
123
123
result . IsValid . Should ( ) . BeFalse ( ) ;
124
+ client . RootNodeInfo ( r => r . RequestConfiguration ( c => c . ConnectTimeout ( 2000 ) ) ) ;
124
125
} ) ;
125
126
e . Should ( ) . NotBeNull ( ) ;
126
127
}
You can’t perform that action at this time.
0 commit comments