Added CommandMap check before requesting cluster nodes (#2014)

Fixes #2012 Co-authored-by: Nick Craver <nrcraver@gmail.com>
StackExchange · Feb 26, 2022 · 65c1f28 · 65c1f28
1 parent 32dea99
commit 65c1f28
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -5,7 +5,8 @@
 - Adds Envoy proxy support (#1989 via rkarthick)
 - When `SUBSCRIBE` is disabled, give proper errors and connect faster (#2001 via NickCraver)
 - Adds `GET` on `SET` command support (present in Redis 6.2+ - #2003 via martinekvili)
-- Improve concurrent load performance when backlogs are utilized (#2008 via NickCraver)
+- Improves concurrent load performance when backlogs are utilized (#2008 via NickCraver)
+- Improves cluster connections when `CLUSTER` command is disabled (#2014 via tylerohlsen)
 
 ## 2.5.27 (prerelease)
 

diff --git a/src/StackExchange.Redis/ConnectionMultiplexer.cs b/src/StackExchange.Redis/ConnectionMultiplexer.cs
@@ -1822,7 +1822,7 @@ internal async Task<bool> ReconfigureAsync(bool first, bool reconfigureAll, LogP
                                             break;
                                     }
 
-                                    if (clusterCount > 0 && !encounteredConnectedClusterServer)
+                                    if (clusterCount > 0 && !encounteredConnectedClusterServer && CommandMap.IsAvailable(RedisCommand.CLUSTER))
                                     {
                                         // We have encountered a connected server with a cluster type for the first time.
                                         // so we will get list of other nodes from this server using "CLUSTER NODES" command

diff --git a/tests/StackExchange.Redis.Tests/ConnectCustomConfig.cs b/tests/StackExchange.Redis.Tests/ConnectCustomConfig.cs
@@ -26,6 +26,24 @@ public void DisabledCommandsStillConnect(string disabledCommands)
             Assert.True(db.IsConnected(default(RedisKey)));
         }
 
+        [Theory]
+        [InlineData("config")]
+        [InlineData("info")]
+        [InlineData("get")]
+        [InlineData("cluster")]
+        [InlineData("config,get")]
+        [InlineData("info,get")]
+        [InlineData("config,info,get")]
+        [InlineData("config,info,get,cluster")]
+        public void DisabledCommandsStillConnectCluster(string disabledCommands)
+        {
+            using var muxer = Create(allowAdmin: true, configuration: TestConfig.Current.ClusterServersAndPorts, disabledCommands: disabledCommands.Split(','), log: Writer);
+
+            var db = muxer.GetDatabase();
+            db.Ping();
+            Assert.True(db.IsConnected(default(RedisKey)));
+        }
+
         [Fact]
         public void TieBreakerIntact()
         {