API: ConfigureEndpoints for Proxies

src/StackExchange.Redis/ConnectionMultiplexer.cs

@@ -43,7 +43,7 @@ public sealed partial class ConnectionMultiplexer : IInternalConnectionMultiplex
         internal bool IsDisposed => _isDisposed;
 
         internal CommandMap CommandMap { get; }
-        internal EndPointCollection EndPoints { get; }
+        internal EndPointCollection EndPoints { get; set; }
         internal ConfigurationOptions RawConfig { get; }
         internal ServerSelectionStrategy ServerSelectionStrategy { get; }
         internal Exception? LastException { get; set; }
@@ -1200,6 +1200,99 @@ public async Task<bool> ConfigureAsync(TextWriter? log = null)
             return await ReconfigureAsync(first: false, reconfigureAll: true, logProxy, null, "configure").ObserveErrors().ForAwait();
         }
 
+
+        /// <summary>
+        /// Reconfigure the connections based on a new endpoint string. For refreshing proxy connections.
+        /// </summary>
+        /// <param name="endpoints">Comma delimited string of new endpoints to configure with</param>
+        /// <param name="log">The <see cref="TextWriter"/> to log to.</param>
+        public bool ConfigureEndPoints(string endpoints, TextWriter? log = null)
+        {
+            // Reset the slot balance for proxies
+            if (RawConfig.Proxy == Proxy.None)
+            {
+                return true;
+            }
+
+            var newEndpoints = new EndPointCollection();
+            endpoints.Split(',').ToList().ForEach(endpoint => {
+                if (!string.IsNullOrWhiteSpace(endpoint)) return;
+                var parsedEndpoint = EndPointCollection.TryParse(endpoint);
+                if (parsedEndpoint == null) return;
+                newEndpoints.TryAdd(parsedEndpoint);
+            });
+
+            if (newEndpoints.Equals(EndPoints))
+            {
+                return true;
+            }
+
+            // Mark obsolete connections as unselectable
+            var obsoleteEndpoints = EndPoints.ToList().Except(newEndpoints).ToList();
+            foreach (var oldEndpoint in obsoleteEndpoints)
+            {
+                ((ServerEndPoint?)servers[oldEndpoint])?.SetUnselectable(UnselectableFlags.DidNotRespond);
+            }
+
+            // Reconfigure with new connections
+            EndPoints = new EndPointCollection(newEndpoints);
+
+            if (!Configure(log))
+            {
+                return false;
+            }
+
+            ServerSelectionStrategy.ResetMap();
+
+            return true;
+        }
+
+         /// <summary>
+        /// Reconfigure the connections based on a new endpoint string. For refreshing proxy connections.
+        /// </summary>
+        /// <param name="endpoints">Comma delimited string of new endpoints to configure with</param>
+        /// <param name="log">The <see cref="TextWriter"/> to log to.</param>
+        public async Task<bool> ConfigureEndPointsAsync(string endpoints, TextWriter? log = null)
+        {
+            if (RawConfig.Proxy == Proxy.None)
+            {
+                return true;
+            }
+
+            var newEndpoints = new EndPointCollection();
+            endpoints.Split(',').ToList().ForEach(endpoint => {
+                if (!string.IsNullOrWhiteSpace(endpoint)) return;
+                var parsedEndpoint = EndPointCollection.TryParse(endpoint);
+                if (parsedEndpoint == null) return;
+                newEndpoints.TryAdd(parsedEndpoint);
+            });
+
+            if (newEndpoints.Equals(EndPoints))
+            {
+                return true;
+            }
+
+            // Mark obsolete connections as unselectable
+            var obsoleteEndpoints = EndPoints.ToList().Except(newEndpoints).ToList();
+            foreach (var oldEndpoint in obsoleteEndpoints)
+            {
+                ((ServerEndPoint?)servers[oldEndpoint])?.SetUnselectable(UnselectableFlags.DidNotRespond);
+            }
+
+            // Reconfigure with new connections
+            EndPoints = new EndPointCollection(newEndpoints);
+
+            if (!await ConfigureAsync(log))
+            {
+                return false;
+            }
+
+            // Reset the slot balance for proxies
+            ServerSelectionStrategy.ResetMap();
+
+            return true;
+        }
+
         internal int SyncConnectTimeout(bool forConnect)
         {
             int retryCount = forConnect ? RawConfig.ConnectRetry : 1;

src/StackExchange.Redis/Interfaces/IConnectionMultiplexer.cs

@@ -216,6 +216,20 @@ public interface IConnectionMultiplexer : IDisposable, IAsyncDisposable
         /// <param name="log">The log to write output to.</param>
         bool Configure(TextWriter? log = null);
 
+        /// <summary>
+        /// Reconfigure the connections based on a new endpoint string
+        /// </summary>
+        /// <param name="endpoints">Set of new endpoints to configure with</param>
+        /// <param name="log">The log to write output to.</param>
+        Task<bool> ConfigureEndPointsAsync(string endpoints, TextWriter? log = null);
+
+        /// <summary>
+        /// Reconfigure the connections based on a new endpoint string
+        /// </summary>
+        /// <param name="endpoints">Comma delimited string of new endpoints to configure with</param>
+        /// <param name="log">The log to write output to.</param>
+        bool ConfigureEndPoints(string endpoints, TextWriter? log = null);
+
         /// <summary>
         /// Provides a text overview of the status of all connections.
         /// </summary>

src/StackExchange.Redis/PublicAPI/PublicAPI.Shipped.txt

@@ -317,6 +317,8 @@ StackExchange.Redis.ConnectionMultiplexer.ConfigurationChanged -> System.EventHa
 StackExchange.Redis.ConnectionMultiplexer.ConfigurationChangedBroadcast -> System.EventHandler<StackExchange.Redis.EndPointEventArgs!>?
 StackExchange.Redis.ConnectionMultiplexer.Configure(System.IO.TextWriter? log = null) -> bool
 StackExchange.Redis.ConnectionMultiplexer.ConfigureAsync(System.IO.TextWriter? log = null) -> System.Threading.Tasks.Task<bool>!
+StackExchange.Redis.ConnectionMultiplexer.ConfigureEndPoints(string! endpoints, System.IO.TextWriter? log = null) -> bool
+StackExchange.Redis.ConnectionMultiplexer.ConfigureEndPointsAsync(string! endpoints, System.IO.TextWriter? log = null) -> System.Threading.Tasks.Task<bool>!
 StackExchange.Redis.ConnectionMultiplexer.ConnectionFailed -> System.EventHandler<StackExchange.Redis.ConnectionFailedEventArgs!>?
 StackExchange.Redis.ConnectionMultiplexer.ConnectionRestored -> System.EventHandler<StackExchange.Redis.ConnectionFailedEventArgs!>?
 StackExchange.Redis.ConnectionMultiplexer.Dispose() -> void
@@ -461,6 +463,8 @@ StackExchange.Redis.IConnectionMultiplexer.ConfigurationChanged -> System.EventH
 StackExchange.Redis.IConnectionMultiplexer.ConfigurationChangedBroadcast -> System.EventHandler<StackExchange.Redis.EndPointEventArgs!>!
 StackExchange.Redis.IConnectionMultiplexer.Configure(System.IO.TextWriter? log = null) -> bool
 StackExchange.Redis.IConnectionMultiplexer.ConfigureAsync(System.IO.TextWriter? log = null) -> System.Threading.Tasks.Task<bool>!
+StackExchange.Redis.IConnectionMultiplexer.ConfigureEndPoints(string! endpoints, System.IO.TextWriter? log = null) -> bool
+StackExchange.Redis.IConnectionMultiplexer.ConfigureEndPointsAsync(string! endpoints, System.IO.TextWriter? log = null) -> System.Threading.Tasks.Task<bool>!
 StackExchange.Redis.IConnectionMultiplexer.ConnectionFailed -> System.EventHandler<StackExchange.Redis.ConnectionFailedEventArgs!>!
 StackExchange.Redis.IConnectionMultiplexer.ConnectionRestored -> System.EventHandler<StackExchange.Redis.ConnectionFailedEventArgs!>!
 StackExchange.Redis.IConnectionMultiplexer.ErrorMessage -> System.EventHandler<StackExchange.Redis.RedisErrorEventArgs!>!

src/StackExchange.Redis/ServerSelectionStrategy.cs

@@ -264,6 +264,11 @@ internal void UpdateClusterRange(int fromInclusive, int toInclusive, ServerEndPo
             }
         }
 
+        internal void ResetMap()
+        {
+            map = new ServerEndPoint[RedisClusterSlotCount];
+        }
+
         private static unsafe int IndexOf(byte* ptr, byte value, int start, int end)
         {
             for (int offset = start; offset < end; offset++)

tests/StackExchange.Redis.Tests/Helpers/SharedConnectionFixture.cs

@@ -133,6 +133,10 @@ public event EventHandler<ServerMaintenanceEvent> ServerMaintenanceEvent
 
         public Task<bool> ConfigureAsync(TextWriter? log = null) => _inner.ConfigureAsync(log);
 
+        public bool ConfigureEndPoints(string endpoints, TextWriter? log = null) => _inner.ConfigureEndPoints(endpoints, log);
+
+        public Task<bool> ConfigureEndPointsAsync(string endpoints, TextWriter? log = null) => _inner.ConfigureEndPointsAsync(endpoints, log);
+
         public void Dispose() { } // DO NOT call _inner.Dispose();
 
         public ValueTask DisposeAsync() => default; // DO NOT call _inner.DisposeAsync();