update

Azure · Oct 31, 2019 · af9fd4b · af9fd4b
1 parent 60d944d
commit af9fd4b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 43 deletions.
diff --git a/src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionBase.cs b/src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionBase.cs
@@ -72,7 +72,7 @@ private set
                 {
                     lock (_statusLock)
                     {
-                        if (_status != value && _status != ServiceConnectionStatus.Terminated)
+                        if (_status != value)
                         {
                             var prev = _status;
                             _status = value;
@@ -173,7 +173,16 @@ public async Task StartAsync(string target = null)
 
         public Task StopAsync()
         {
-            return InternalStopAsync(ServiceConnectionStatus.Terminated);
+            try
+            {
+                _connectionContext?.Transport.Input.CancelPendingRead();
+            }
+            catch (Exception ex)
+            {
+                Log.UnexpectedExceptionInStop(Logger, ConnectionId, ex);
+            }
+
+            return Task.CompletedTask;
         }
 
         public virtual async Task WriteAsync(ServiceMessage serviceMessage)
@@ -503,7 +512,7 @@ private async Task KeepAliveAsync(TimerAwaitable timer)
                     if (Stopwatch.GetTimestamp() - Interlocked.Read(ref _lastReceiveTimestamp) > DefaultServiceTimeoutTicks)
                     {
                         Log.ServiceTimeout(Logger, DefaultServiceTimeout, ConnectionId);
-                        await InternalStopAsync();
+                        await StopAsync();
                         // We shouldn't get here twice.
                         continue;
                     }
@@ -539,21 +548,6 @@ private async ValueTask TrySendPingAsync()
             }
         }
 
-        private Task InternalStopAsync(ServiceConnectionStatus? newStatus = null)
-        {
-            try
-            {
-                _connectionContext?.Transport.Input.CancelPendingRead();
-                Status = newStatus ?? Status;
-            }
-            catch (Exception ex)
-            {
-                Log.UnexpectedExceptionInStop(Logger, ConnectionId, ex);
-            }
-
-            return Task.CompletedTask;
-        }
-
         protected virtual ReadOnlyMemory<byte> GetPingMessage() => _cachedPingBytes;
 
         private static class Log

diff --git a/src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionContainerBase.cs b/src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionContainerBase.cs
@@ -26,10 +26,13 @@ internal abstract class ServiceConnectionContainerBase : IServiceConnectionConta
         private readonly object _statusLock = new object();
 
         private readonly AckHandler _ackHandler;
+
         private volatile List<IServiceConnection> _fixedServiceConnections;
 
         private volatile ServiceConnectionStatus _status;
 
+        private volatile bool _terminated = false;
+
         protected ILogger Logger { get; }
 
         protected List<IServiceConnection> FixedServiceConnections
@@ -112,7 +115,11 @@ public Task StartAsync()
             return Task.WhenAll(FixedServiceConnections.Select(c => StartCoreAsync(c)));
         }
 
-        public virtual Task StopAsync() => Task.WhenAll(FixedServiceConnections.Select(c => c.StopAsync()));
+        public virtual Task StopAsync()
+        {
+            _terminated = true;
+            return Task.WhenAll(FixedServiceConnections.Select(c => c.StopAsync()));
+        }
 
         /// <summary>
         /// Start and manage the whole connection lifetime
@@ -126,7 +133,10 @@ protected async Task StartCoreAsync(IServiceConnection connection, string target
             }
             finally
             {
-                await OnConnectionComplete(connection);
+                if (!_terminated)
+                {
+                    await OnConnectionComplete(connection);
+                }
             }
         }
 
@@ -155,11 +165,6 @@ protected virtual async Task OnConnectionComplete(IServiceConnection serviceConn
                 throw new ArgumentNullException(nameof(serviceConnection));
             }
 
-            if (serviceConnection.Status == ServiceConnectionStatus.Terminated)
-            {
-                return;
-            }
-
             serviceConnection.ConnectionStatusChanged -= OnConnectionStatusChanged;
 
             if (serviceConnection.Status == ServiceConnectionStatus.Connected)
@@ -288,22 +293,9 @@ protected virtual void Dispose(bool disposing)
 
         protected virtual ServiceConnectionStatus GetStatus()
         {
-            var statuses = (from conn in FixedServiceConnections
-                            group conn by conn.Status into g
-                            select g.Key
-                   ).ToDictionary(status => status, _ => 0);
-
-            if (statuses.ContainsKey(ServiceConnectionStatus.Connected))
-            {
-                return ServiceConnectionStatus.Connected;
-            }
-
-            if (statuses.ContainsKey(ServiceConnectionStatus.Terminated))
-            {
-                return ServiceConnectionStatus.Terminated;
-            }
-
-            return ServiceConnectionStatus.Disconnected;
+            return FixedServiceConnections.Any(s => s.Status == ServiceConnectionStatus.Connected)
+                ? ServiceConnectionStatus.Connected
+                : ServiceConnectionStatus.Disconnected;
         }
 
         private Task WriteToRandomAvailableConnection(ServiceMessage serviceMessage)

diff --git a/src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionStatus.cs b/src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionStatus.cs
@@ -10,6 +10,5 @@ internal enum ServiceConnectionStatus
         Disconnected,
         Connecting,
         Connected,
-        Terminated
     }
 }
diff --git a/test/Microsoft.Azure.SignalR.E2ETests/Management/ServiceHubContextE2EFacts.cs b/test/Microsoft.Azure.SignalR.E2ETests/Management/ServiceHubContextE2EFacts.cs
@@ -238,7 +238,7 @@ internal async Task StopServiceHubContextTest()
                 await Task.Delay(100);
                 var status = ((ServiceHubContext) serviceHubContext).GetConnectionStatus();
                 await ((ServiceHubContext) serviceHubContext).DisposeAsync();
-                Assert.Equal(ServiceConnectionStatus.Terminated, status);
+                Assert.Equal(ServiceConnectionStatus.Disconnected, status);
             }
         }