reapply bits missed from complex merge

Author: mgravell

src/StackExchange.Redis/PhysicalConnection.Read.cs

@@ -49,7 +49,7 @@ private async Task ReadAllAsync(CancellationToken cancellationToken)
                 _readStatus = ReadStatus.TryParseResult;
             }
             // another formatter glitch
-            while (CommitAndParseFrames(read));
+            while (CommitAndParseFrames(read) && !ForceReconnect);
 
             _readStatus = ReadStatus.ProcessBufferComplete;
 
@@ -74,6 +74,8 @@ private async Task ReadAllAsync(CancellationToken cancellationToken)
         }
     }
 
+    private bool ForceReconnect => BridgeCouldBeNull?.NeedsReconnect == true;
+
     private static byte[]? SharedNoLease;
 
     private CycleBuffer _readBuffer;

tests/StackExchange.Redis.Tests/InProcessTestServer.cs

@@ -42,12 +42,6 @@ public ConfigurationOptions GetClientConfig(bool withPubSub = false)
             commands.Remove(nameof(RedisCommand.PUBLISH));
             commands.Remove(nameof(RedisCommand.SPUBLISH));
         }
-        // transactions don't work yet
-        commands.Remove(nameof(RedisCommand.MULTI));
-        commands.Remove(nameof(RedisCommand.EXEC));
-        commands.Remove(nameof(RedisCommand.DISCARD));
-        commands.Remove(nameof(RedisCommand.WATCH));
-        commands.Remove(nameof(RedisCommand.UNWATCH));
 
         var config = new ConfigurationOptions
         {

tests/StackExchange.Redis.Tests/TestBase.cs

@@ -16,7 +16,7 @@ namespace StackExchange.Redis.Tests;
 
 public abstract class TestBase : IDisposable
 {
-    private ITestOutputHelper Output { get; }
+    protected ITestOutputHelper Output { get; }
     protected TextWriterOutputHelper Writer { get; }
     protected virtual string GetConfiguration()
     {

toys/StackExchange.Redis.Server/RespServer.cs

@@ -294,7 +294,10 @@ public async Task RunClientAsync(IDuplexPipe pipe, RedisServer.Node node = null,
                     {
                         // process a completed request
                         RedisRequest request = new(buffer.Slice(0, consumed), ref commandLease);
+                        request = request.WithClient(client);
                         var response = Execute(client, request);
+                        client.ResetAfterRequest();
+
                         await WriteResponseAsync(client, pipe.Output, response, client.Protocol);
 
                         // advance the buffer to account for the message we just read
@@ -529,10 +532,14 @@ public virtual TypedRedisValue Execute(RedisClient client, in RedisRequest reque
                 if (result.IsError) Interlocked.Increment(ref _totalErrorCount);
                 return result;
             }
-            catch (KeyMovedException moved) when (GetNode(moved.HashSlot) is { } node)
+            catch (KeyMovedException moved)
             {
-                OnMoved(client, moved.HashSlot, node);
-                return TypedRedisValue.Error($"MOVED {moved.HashSlot} {node.Host}:{node.Port}");
+                if (GetNode(moved.HashSlot) is { } node)
+                {
+                    OnMoved(client, moved.HashSlot, node);
+                    return TypedRedisValue.Error($"MOVED {moved.HashSlot} {node.Host}:{node.Port}");
+                }
+                return TypedRedisValue.Error($"ERR key has been migrated from slot {moved.HashSlot}, but the new owner is unknown");
             }
             catch (CrossSlotException)
             {