Skip to content

Fix #1166 failing thrift test #1192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2015
Merged

Fix #1166 failing thrift test #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ public ThriftConnection(IConnectionConfigurationValues connectionSettings, TProt
var protocol = protocolFactory == null ? new TBinaryProtocol(transport) : protocolFactory.GetProtocol(transport);

var client = new Rest.Client(protocol);
tsocket.ConnectTimeout = this._connectionSettings.PingTimeout.GetValueOrDefault(200);
tsocket.Timeout = this._connectionSettings.Timeout;
tsocket.TcpClient.SendTimeout = this._connectionSettings.Timeout;
tsocket.TcpClient.ReceiveTimeout = this._connectionSettings.Timeout;
//tsocket.TcpClient.NoDelay = true;
tsocket.TcpClient.NoDelay = true;

queue.Enqueue(client);

Expand Down
19 changes: 11 additions & 8 deletions src/Connections/Elasticsearch.Net.Connection.Thrift/Transport/TSocket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public TSocket(TcpClient client)
}
}

public TSocket(string host, int port) : this(host, port, 0)
public TSocket(string host, int port)
: this(host, port, 0)
{
}

Expand All @@ -57,6 +58,8 @@ public TSocket(string host, int port, int timeout)
InitSocket();
}

public int ConnectTimeout { get; set; }

public int Timeout
{
set { client.ReceiveTimeout = client.SendTimeout = timeout = value; }
Expand Down Expand Up @@ -118,14 +121,14 @@ public override void Open()
InitSocket();
}


var connectionRequest = client.BeginConnect(host, port, null, null);
var connected = connectionRequest.AsyncWaitHandle.WaitOne(timeout);

if (!connected)
{
throw new TTransportException("Failed to connect");
}
var connectionRequest = client.BeginConnect(host, port, null, null);
var connected = connectionRequest.AsyncWaitHandle.WaitOne(this.ConnectTimeout);

if (!connected)
{
throw new TTransportException("Failed to connect");
}

inputStream = client.GetStream();
outputStream = client.GetStream();
Expand Down