Send connect commands outside of managed buffer to prevent pollution with pending commands

Author: mythz

src/ServiceStack.Redis/RedisNativeClient_Utils.cs

@@ -140,13 +140,13 @@ private void Connect()
                 Bstream = new BufferedStream(networkStream, 16 * 1024);
 
                 if (!string.IsNullOrEmpty(Password))
-                    SendExpectSuccess(Commands.Auth, Password.ToUtf8Bytes());
+                    SendUnmanagedExpectSuccess(Commands.Auth, Password.ToUtf8Bytes());
 
                 if (db != 0)
-                    SendExpectSuccess(Commands.Select, db.ToUtf8Bytes());
+                    SendUnmanagedExpectSuccess(Commands.Select, db.ToUtf8Bytes());
 
                 if (Client != null)
-                    SendExpectSuccess(Commands.Client, Commands.SetName, Client.ToUtf8Bytes());
+                    SendUnmanagedExpectSuccess(Commands.Client, Commands.SetName, Client.ToUtf8Bytes());
 
                 try
                 {
@@ -370,6 +370,24 @@ protected void WriteCommandToSendBuffer(params byte[][] cmdWithBinaryArgs)
             WriteAllToSendBuffer(cmdWithBinaryArgs);
         }
 
+        /// <summary>
+        /// Send command outside of managed Write Buffer
+        /// </summary>
+        /// <param name="cmdWithBinaryArgs"></param>
+        protected void SendUnmanagedExpectSuccess(params byte[][] cmdWithBinaryArgs)
+        {
+            var bytes = GetCmdBytes('*', cmdWithBinaryArgs.Length);
+
+            foreach (var safeBinaryValue in cmdWithBinaryArgs)
+            {
+                bytes = bytes.Combine(GetCmdBytes('$', safeBinaryValue.Length), safeBinaryValue, endData);
+            }
+
+            Bstream.Write(bytes, 0, bytes.Length);
+
+            ExpectSuccess();
+        }
+
         public void WriteAllToSendBuffer(params byte[][] cmdWithBinaryArgs)
         {
             WriteToSendBuffer(GetCmdBytes('*', cmdWithBinaryArgs.Length));

tests/ServiceStack.Redis.Tests/Issues/AuthIssue.cs

@@ -0,0 +1,42 @@
+using System.Linq;
+using NUnit.Framework;
+
+namespace ServiceStack.Redis.Tests.Issues
+{
+    public class AuthIssue
+    {
+        [Test]
+        [Ignore("Requires password on master")]
+        public void Does_retry_failed_commands_auth()
+        {
+            // -> Redis must have "requirepass testpassword" in config
+            var connstr = "testpassword@localhost";
+            RedisStats.Reset();
+
+            var redisCtrl = new RedisClient(connstr); //RedisConfig.DefaultHost
+            redisCtrl.FlushAll();
+            redisCtrl.SetClient("redisCtrl");
+
+            var redis = new RedisClient(connstr);
+            redis.SetClient("redisRetry");
+
+            var clientInfo = redisCtrl.GetClientsInfo();
+            var redisId = clientInfo.First(m => m["name"] == "redisRetry")["id"];
+            Assert.That(redisId.Length, Is.GreaterThan(0));
+
+            Assert.That(redis.IncrementValue("retryCounter"), Is.EqualTo(1));
+
+            redis.OnBeforeFlush = () =>
+            {
+                redisCtrl.KillClients(withId: redisId);
+            };
+
+            Assert.That(redis.IncrementValue("retryCounter"), Is.EqualTo(2));
+            Assert.That(redis.Get<int>("retryCounter"), Is.EqualTo(2));
+
+            Assert.That(RedisStats.TotalRetryCount, Is.EqualTo(1));
+            Assert.That(RedisStats.TotalRetrySuccess, Is.EqualTo(1));
+            Assert.That(RedisStats.TotalRetryTimedout, Is.EqualTo(0));
+        }
+    }
+}

tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj

@@ -184,6 +184,7 @@
     <Compile Include="BasicRediscClientManagerTests.cs" />
     <Compile Include="ConfigTests.cs" />
     <Compile Include="CustomCommandTests.cs" />
+    <Compile Include="Issues\AuthIssue.cs" />
     <Compile Include="LuaCachedScripts.cs" />
     <Compile Include="Examples\TestData.cs" />
     <Compile Include="Issues\RedisCharacterizationTests.cs" />