Skip to content
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

enh: refactor WebSocket connections to support concurrency #100

Open
wants to merge 12 commits into
base: 3.0
Choose a base branch
from
Open

enh: refactor WebSocket connections to support concurrency #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a8bee29
enh: refactor WebSocket connections to support concurrency
huskar-t Jan 19, 2025
9d1d58d
fix: websocket reconnect
huskar-t Jan 19, 2025
bc221d7
test: add concurrency test
huskar-t Jan 23, 2025
7351aed
enh: handle send exception
huskar-t Jan 24, 2025
a41bda6
enh: add ConfigureAwait to improve performance
huskar-t Feb 6, 2025
c6bef1a
enh: improve websocket performance
huskar-t Feb 7, 2025
25d422c
test: add invalid reqid test
huskar-t Feb 8, 2025
7a8527f
enh: throw original exception
huskar-t Feb 8, 2025
23f044e
enh: simplify the code
huskar-t Feb 8, 2025
694231b
test: add websocket timeout test
huskar-t Feb 8, 2025
ed741ff
enh: close connection when request or response exception
huskar-t Feb 10, 2025
393ec3c
enh: do not close connection after timeout
huskar-t Feb 10, 2025
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
62 changes: 36 additions & 26 deletions src/Driver/Client/Websocket/WSClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public class WSClient : ITDengineClient
private Connection _connection;
private readonly TimeZoneInfo _tz;
private readonly ConnectionStringBuilder _builder;
private readonly object _reconnectLock = new object();


public WSClient(ConnectionStringBuilder builder)
{
Expand Down Expand Up @@ -66,42 +68,50 @@ private void Reconnect()
{
if (!_builder.AutoReconnect)
return;

Connection connection = null;
for (int i = 0; i < _builder.ReconnectRetryCount; i++)
lock (_reconnectLock)
{
try
if (_connection != null)
{
// sleep
System.Threading.Thread.Sleep(_builder.ReconnectIntervalMs);
connection = new Connection(GetUrl(_builder), _builder.Username, _builder.Password,
_builder.Database, _builder.ConnTimeout, _builder.ReadTimeout, _builder.WriteTimeout,
_builder.EnableCompression);
connection.Connect();
break;
// connection is available, no need to reconnect
if (_connection.IsAvailable()) return;
}
catch (Exception)

Connection connection = null;
for (int i = 0; i < _builder.ReconnectRetryCount; i++)
{
if (connection != null)
try
{
// sleep
System.Threading.Thread.Sleep(_builder.ReconnectIntervalMs);
connection = new Connection(GetUrl(_builder), _builder.Username, _builder.Password,
_builder.Database, _builder.ConnTimeout, _builder.ReadTimeout, _builder.WriteTimeout,
_builder.EnableCompression);
connection.Connect();
break;
}
catch (Exception)
{
connection.Close();
connection = null;
if (connection != null)
{
connection.Close();
connection = null;
}
}
}
}

if (connection == null)
{
throw new TDengineError((int)TDengineError.InternalErrorCode.WS_RECONNECT_FAILED,
"websocket connection reconnect failed");
}
if (connection == null)
{
throw new TDengineError((int)TDengineError.InternalErrorCode.WS_RECONNECT_FAILED,
"websocket connection reconnect failed");
}

if (_connection != null)
{
_connection.Close();
}
if (_connection != null)
{
_connection.Close();
}

_connection = connection;
_connection = connection;
}
}

public IStmt StmtInit()
Expand Down
Loading