Move EndpointRoutingMode to EndpointRouterDecorator

src/Microsoft.Azure.SignalR/EndpointRouters/DefaultEndpointRouter.cs

@@ -6,42 +6,29 @@
 using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Azure.SignalR.Common;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.Azure.SignalR
 {
  internal class DefaultEndpointRouter : DefaultMessageRouter, IEndpointRouter
  {
- private readonly EndpointRoutingMode _mode;
-
- public DefaultEndpointRouter(IOptions<ServiceOptions> options)
- {
- _mode = options?.Value.EndpointRoutingMode ?? EndpointRoutingMode.Weighted;
- }
-
  /// <summary>
- /// Select an endpoint for negotiate request according to the mode
+ /// Select an endpoint for negotiate request
  /// </summary>
  /// <param name="context">The http context of the incoming request</param>
  /// <param name="endpoints">All the available endpoints</param>
- public ServiceEndpoint GetNegotiateEndpoint(HttpContext context, IEnumerable<ServiceEndpoint> endpoints)
+ public virtual ServiceEndpoint GetNegotiateEndpoint(HttpContext context, IEnumerable<ServiceEndpoint> endpoints)
  {
  // get primary endpoints snapshot
  var availableEndpoints = GetNegotiateEndpoints(endpoints);
- return _mode switch
- {
- EndpointRoutingMode.Random => GetEndpointRandomly(availableEndpoints),
- EndpointRoutingMode.LeastConnection => GetEndpointWithLeastConnection(availableEndpoints),
- _ => GetEndpointAccordingToWeight(availableEndpoints),
- };
+ return GetEndpointAccordingToWeight(availableEndpoints);
  }
 
  /// <summary>
  /// Only primary endpoints will be returned by client /negotiate
  /// If no primary endpoint is available, promote one secondary endpoint
  /// </summary>
  /// <returns>The available endpoints</returns>
- private ServiceEndpoint[] GetNegotiateEndpoints(IEnumerable<ServiceEndpoint> endpoints)
+ protected ServiceEndpoint[] GetNegotiateEndpoints(IEnumerable<ServiceEndpoint> endpoints)
  {
  var primary = endpoints.Where(s => s.Online && s.EndpointType == EndpointType.Primary).ToArray();
  if (primary.Length > 0)
@@ -69,7 +56,7 @@ private ServiceEndpoint GetEndpointAccordingToWeight(ServiceEndpoint[] available
  if (availableEndpoints.Any(endpoint => endpoint.EndpointMetrics.ConnectionCapacity == 0) ||
  availableEndpoints.Length == 1)
  {
- return GetEndpointRandomly(availableEndpoints);
+ return availableEndpoints[StaticRandom.Next(availableEndpoints.Length)];
  }
 
  var we = new int[availableEndpoints.Length];
@@ -89,38 +76,5 @@ private ServiceEndpoint GetEndpointAccordingToWeight(ServiceEndpoint[] available
 
  return availableEndpoints[Array.FindLastIndex(we, x => x <= index) + 1];
  }
-
- /// <summary>
- /// Choose endpoint with least connection count
- /// </summary>
- private ServiceEndpoint GetEndpointWithLeastConnection(ServiceEndpoint[] availableEndpoints)
- {
- //first check if weight is available or necessary
- if (availableEndpoints.Any(endpoint => endpoint.EndpointMetrics.ConnectionCapacity == 0) ||
- availableEndpoints.Length == 1)
- {
- return GetEndpointRandomly(availableEndpoints);
- }
-
- var leastConnectionCount = int.MaxValue;
- var index = 0;
- for (var i = 0; i < availableEndpoints.Length; i++)
- {
- var endpointMetrics = availableEndpoints[i].EndpointMetrics;
- var connectionCount = endpointMetrics.ClientConnectionCount + endpointMetrics.ServerConnectionCount;
- if (connectionCount < leastConnectionCount)
- {
- leastConnectionCount = connectionCount;
- index = i;
- }
- }
-
- return availableEndpoints[index];
- }
-
- private static ServiceEndpoint GetEndpointRandomly(ServiceEndpoint[] availableEndpoints)
- {
- return availableEndpoints[StaticRandom.Next(availableEndpoints.Length)];
- }
  }
 }

src/Microsoft.Azure.SignalR/EndpointRouters/EndpointRouterDecorator.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.Azure.SignalR
 {
@@ -13,12 +12,23 @@ public class EndpointRouterDecorator : IEndpointRouter
 
  public EndpointRouterDecorator(IEndpointRouter router = null)
  {
- _inner = router ?? new DefaultEndpointRouter(null);
+ _inner = router ?? new DefaultEndpointRouter();
  }
 
- public EndpointRouterDecorator(IEndpointRouter router = null, IOptions<ServiceOptions> options = null)
+ public EndpointRouterDecorator(EndpointRoutingMode endpointRoutingMode)
  {
- _inner = router ?? new DefaultEndpointRouter(options);
+ switch (endpointRoutingMode)
+ {
+ case EndpointRoutingMode.Random:
+ _inner = new RandomEndpointRouter();
+ break;
+ case EndpointRoutingMode.LeastConnection:
+ _inner = new LeastConnectionEndpointRouter();
+ break;
+ default:
+ _inner = new DefaultEndpointRouter();
+ break;
+ }
  }
 
  public virtual ServiceEndpoint GetNegotiateEndpoint(HttpContext context, IEnumerable<ServiceEndpoint> endpoints)

src/Microsoft.Azure.SignalR/EndpointRouters/LeastConnectionEndpointRouter.cs

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.Azure.SignalR
+{
+ internal class LeastConnectionEndpointRouter : DefaultEndpointRouter
+ {
+ /// <summary>
+ /// Select an endpoint for negotiate request
+ /// </summary>
+ /// <param name="context">The http context of the incoming request</param>
+ /// <param name="endpoints">All the available endpoints</param>
+ public override ServiceEndpoint GetNegotiateEndpoint(HttpContext context, IEnumerable<ServiceEndpoint> endpoints)
+ {
+ // get primary endpoints snapshot
+ var availableEndpoints = GetNegotiateEndpoints(endpoints);
+ return GetEndpointWithLeastConnection(availableEndpoints);
+ }
+
+ /// <summary>
+ /// Choose endpoint with least connection count
+ /// </summary>
+ private ServiceEndpoint GetEndpointWithLeastConnection(ServiceEndpoint[] availableEndpoints)
+ {
+ //first check if weight is available or necessary
+ if (availableEndpoints.Any(endpoint => endpoint.EndpointMetrics.ConnectionCapacity == 0) ||
+ availableEndpoints.Length == 1)
+ {
+ return availableEndpoints[StaticRandom.Next(availableEndpoints.Length)];
+ }
+
+ var leastConnectionCount = int.MaxValue;
+ var index = 0;
+ for (var i = 0; i < availableEndpoints.Length; i++)
+ {
+ var endpointMetrics = availableEndpoints[i].EndpointMetrics;
+ var connectionCount = endpointMetrics.ClientConnectionCount + endpointMetrics.ServerConnectionCount;
+ if (connectionCount < leastConnectionCount)
+ {
+ leastConnectionCount = connectionCount;
+ index = i;
+ }
+ }
+
+ return availableEndpoints[index];
+ }
+ }
+}

src/Microsoft.Azure.SignalR/EndpointRouters/RandomEndpointRouter.cs

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.Azure.SignalR
+{
+ internal class RandomEndpointRouter : DefaultEndpointRouter
+ {
+ /// <summary>
+ /// Select an endpoint for negotiate request according to the mode
+ /// </summary>
+ /// <param name="context">The http context of the incoming request</param>
+ /// <param name="endpoints">All the available endpoints</param>
+ public override ServiceEndpoint GetNegotiateEndpoint(HttpContext context, IEnumerable<ServiceEndpoint> endpoints)
+ {
+ // get primary endpoints snapshot
+ var availableEndpoints = GetNegotiateEndpoints(endpoints);
+ return availableEndpoints[StaticRandom.Next(availableEndpoints.Length)];
+ }
+ }
+}

test/Microsoft.Azure.SignalR.Tests/EndpointRouterTests.cs

@@ -66,12 +66,9 @@ private static IEndpointRouter GetEndpointRouter(EndpointRoutingMode mode)
  {
  var config = new ConfigurationBuilder().Build();
  var serviceProvider = new ServiceCollection()
+ .AddSingleton<IEndpointRouter>(new EndpointRouterDecorator(mode))
  .AddSignalR()
- .AddAzureSignalR(
- o =>
- {
- o.EndpointRoutingMode = mode;
- })
+ .AddAzureSignalR()
  .Services
  .AddSingleton<IConfiguration>(config)
  .BuildServiceProvider();

test/Microsoft.Azure.SignalR.Tests/MultiEndpointServiceConnectionContainerTests.cs

@@ -245,7 +245,7 @@ public async Task TestContainerWithOneEndpointWithAllDisconnectedConnectionThrow
  {
  var endpoint = new ServiceEndpoint(ConnectionString1);
  var sem = new TestServiceEndpointManager(endpoint);
- var router = new DefaultEndpointRouter(null);
+ var router = new DefaultEndpointRouter();
 
  var container = new TestMultiEndpointServiceConnectionContainer("hub",
  e => new TestServiceConnectionContainer(new List<IServiceConnection> {