Resolve new client when attempting to resolve Master client.

Author: mythz

src/ServiceStack.Redis/RedisResolver.cs

@@ -96,6 +96,8 @@ public virtual RedisClient CreateRedisClient(RedisEndpoint config, bool master)
 
                         firstEx ??= ex;
                         ExecUtils.SleepBackOffMultiplier(++i);
+                        client?.Dispose();
+                        client = ClientFactory(config);
                     }
                 }
                 throw new TimeoutException($"Could not resolve master instance within {config.RetryTimeout}ms RetryTimeout", firstEx);

tests/ServiceStack.Redis.Tests/RedisPasswordTests.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 
 namespace ServiceStack.Redis.Tests
 {
@@ -29,8 +30,9 @@ public void Passwords_are_not_leaked_in_exception_messages()
             Assert.Throws<RedisResponseException>(() => {
                     try
                     {
-                        var factory = new PooledRedisClientManager(password + "@" +
-                                TestConfig.SingleHost); // redis will throw when using password and it's not configured
+                        var connString = password + "@" + TestConfig.SingleHost + "?RetryTimeout=2000";
+                        // redis will throw when using password and it's not configured
+                        var factory = new PooledRedisClientManager(connString); 
                         using var redis = factory.GetClient();
                         redis.SetValue("Foo", "Bar");
                     }
@@ -39,6 +41,11 @@ public void Passwords_are_not_leaked_in_exception_messages()
                         Assert.That(ex.Message, Is.Not.Contains(password));
                         throw;
                     }
+                    catch (TimeoutException tex)
+                    {
+                        Assert.That(tex.InnerException.Message, Is.Not.Contains(password));
+                        throw tex.InnerException;
+                    }
                 },
                 "Expected an exception after Redis AUTH command; try using a password that doesn't match.");
         }