ping tarantool, done

Author: Dmitry-Bryliuk

src/tarantool.client/LogicalConnectionManager.cs

@@ -27,7 +27,7 @@ public class LogicalConnectionManager : ILogicalConnection
 
         private const int connectionTimeout = 1000;
 
-        private const int connectionPingInterval = 1000;
+        private const int pingInterval = 100;
 
         public LogicalConnectionManager(ClientOptions options)
         {
@@ -42,17 +42,7 @@ public void Dispose()
             }
 
             Interlocked.Exchange(ref _droppableLogicalConnection, null)?.Dispose();
-
-            var savedTimer = Interlocked.Exchange(ref _timer, null);
-            if (savedTimer != null)
-            {
-                using (var timerDisposedEvent = new ManualResetEvent(false))
-                {
-                    savedTimer.Dispose(timerDisposedEvent);
-                    // this will guarantee that all callbacks finished
-                    timerDisposedEvent.WaitOne();
-                }
-            }
+            Interlocked.Exchange(ref _timer, null)?.Dispose();
         }
 
         public async Task Connect()
@@ -69,37 +59,36 @@ public async Task Connect()
 
             _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connected...");
 
-            _timer = new Timer(x => CheckPing(), null, connectionPingInterval, Timeout.Infinite);
+            _timer = new Timer(x => CheckPing(), null, pingInterval, Timeout.Infinite);
         }
 
-        private static readonly PingRequest pingRequest = new PingRequest();
+        private static readonly PingRequest _pingRequest = new PingRequest();
 
         private void CheckPing()
         {
             LogicalConnection savedConnection = _droppableLogicalConnection;
 
-            if (savedConnection == null)
-            {
-                return;
-            }
-
             try
             {
-                Task task = savedConnection.SendRequestWithEmptyResponse(pingRequest);
-                if (!task.Wait(connectionTimeout) || task.Status != TaskStatus.RanToCompletion)
+                if (savedConnection == null || !savedConnection.IsConnected())
                 {
-                    savedConnection.Dispose();
+                    return;
+                }
+
+                using (Task task = savedConnection.SendRequestWithEmptyResponse(_pingRequest))
+                {
+                    if (Task.WaitAny(new[] { task }, connectionTimeout) != 0 || task.Status != TaskStatus.RanToCompletion)
+                    {
+                        _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Ping failed, dropping logical conection...");
+                        savedConnection.Dispose();
+                    }
                 }
-            }
-            catch (AggregateException ae)
-            {
-                savedConnection.Dispose();
             }
             finally
             {
                 if (_disposing == 0)
                 {
-                    _timer?.Change(connectionPingInterval, Timeout.Infinite);
+                    _timer?.Change(pingInterval, Timeout.Infinite);
                 }
             }
         }

src/tarantool.client/NetworkStreamPhysicalConnection.cs

@@ -42,25 +42,11 @@ public async Task Connect(ClientOptions options)
 
             _socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
             await ConnectAsync(_socket, singleNode.Uri.Host, singleNode.Uri.Port);
-            // unfortunately does not worl under linux
-            // SetKeepAlive(true, 1000, 100);
+
             _stream = new NetworkStream(_socket, true);
             options.LogWriter?.WriteLine("Socket connection established.");
         }
 
-        private void SetKeepAlive(bool on, uint keepAliveTime, uint keepAliveInterval)
-        {
-            int size = Marshal.SizeOf(new uint());
-
-            var inOptionValues = new byte[size * 3];
-
-            BitConverter.GetBytes((uint)(on ? 1 : 0)).CopyTo(inOptionValues, 0);
-            BitConverter.GetBytes(keepAliveTime).CopyTo(inOptionValues, size);
-            BitConverter.GetBytes(keepAliveInterval).CopyTo(inOptionValues, size * 2);
-
-            _socket.IOControl(IOControlCode.KeepAliveValues, inOptionValues, null);
-        }
-
         public void Write(byte[] buffer, int offset, int count)
         {
             CheckConnectionStatus();
@@ -125,11 +111,7 @@ public bool IsConnected()
                 return false;
             }
 
-            try
-            {
-                return !(_socket.Poll(1, SelectMode.SelectRead) && _socket.Available == 0);
-            }
-            catch (SocketException) { return false; }
+            return true;
         }
 
         private void CheckConnectionStatus()