Respect IncludeDetailInExceptions in MOVED etc scenarios from ResultP…

…rocessor (#2267) ResultProcessor should be more reticent if IncludeDetailInExceptions is disabled
StackExchange · Oct 12, 2022 · bff0811 · bff0811
1 parent f81553b
commit bff0811
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -1,7 +1,9 @@
 # Release Notes
 
 ## Unreleased
-- No unreleased changes at this time
+
+- Fix: `MOVED` with `NoRedirect` (and other non-reachable errors) should respect the `IncludeDetailInExceptions` setting
+
 
 ## 2.6.66
 

diff --git a/src/StackExchange.Redis/ResultProcessor.cs b/src/StackExchange.Redis/ResultProcessor.cs
@@ -267,13 +267,27 @@ public virtual bool SetResult(PhysicalConnection connection, Message message, in
                             {
                                 if (isMoved && wasNoRedirect)
                                 {
-                                    err = $"Key has MOVED to Endpoint {endpoint} and hashslot {hashSlot} but CommandFlags.NoRedirect was specified - redirect not followed for {message.CommandAndKey}. ";
+                                    if (bridge.Multiplexer.IncludeDetailInExceptions)
+                                    {
+                                        err = $"Key has MOVED to Endpoint {endpoint} and hashslot {hashSlot} but CommandFlags.NoRedirect was specified - redirect not followed for {message.CommandAndKey}. ";
+                                    }
+                                    else
+                                    {
+                                        err = "Key has MOVED but CommandFlags.NoRedirect was specified - redirect not followed. ";
+                                    }
                                 }
                                 else
                                 {
                                     unableToConnectError = true;
-                                    err = $"Endpoint {endpoint} serving hashslot {hashSlot} is not reachable at this point of time. Please check connectTimeout value. If it is low, try increasing it to give the ConnectionMultiplexer a chance to recover from the network disconnect. "
-                                        + PerfCounterHelper.GetThreadPoolAndCPUSummary(bridge.Multiplexer.RawConfig.IncludePerformanceCountersInExceptions);
+                                    if (bridge.Multiplexer.IncludeDetailInExceptions)
+                                    {
+                                        err = $"Endpoint {endpoint} serving hashslot {hashSlot} is not reachable at this point of time. Please check connectTimeout value. If it is low, try increasing it to give the ConnectionMultiplexer a chance to recover from the network disconnect. "
+                                            + PerfCounterHelper.GetThreadPoolAndCPUSummary(bridge.Multiplexer.RawConfig.IncludePerformanceCountersInExceptions);
+                                    }
+                                    else
+                                    {
+                                        err = "Endpoint is not reachable at this point of time. Please check connectTimeout value. If it is low, try increasing it to give the ConnectionMultiplexer a chance to recover from the network disconnect. ";
+                                    }
                                 }
                             }
                         }