Merge branch 'master' into pipelines

.gitignore

@@ -19,5 +19,6 @@ StackExchange.Redis.*.zip
 .idea/
 .vs/
 *.lock.json
+test-results*.xml
 packages/
 StackExchange.Redis.Tests/*Config.json

StackExchange.Redis.Tests/Cluster.cs

@@ -36,22 +36,39 @@ public void ExportConfiguration()
         }
 
         [Fact]
-        public void ConnectUsesSingleSocket()
+        public async Task ConnectUsesSingleSocket()
         {
-            for (int i = 0; i < 10; i++)
+            using (var sw = new StringWriter())
             {
-                using (var muxer = Create(failMessage: i + ": "))
+                try
                 {
-                    foreach (var ep in muxer.GetEndPoints())
+                    for (int i = 0; i < 5; i++)
                     {
-                        var srv = muxer.GetServer(ep);
-                        var counters = srv.GetCounters();
-                        Output.WriteLine(i + "; interactive, " + ep);
-                        Assert.Equal(1, counters.Interactive.SocketCount);
-                        Output.WriteLine(i + "; subscription, " + ep);
-                        Assert.Equal(1, counters.Subscription.SocketCount);
+                        using (var muxer = Create(failMessage: i + ": ", log: sw))
+                        {
+                            await Task.Delay(500);
+                            foreach (var ep in muxer.GetEndPoints())
+                            {
+                                var srv = muxer.GetServer(ep);
+                                var counters = srv.GetCounters();
+                                Output.WriteLine($"{i}; interactive, {ep}, count: {counters.Interactive.SocketCount}");
+                                Output.WriteLine($"{i}; subscription, {ep}, count: {counters.Subscription.SocketCount}");
+                            }
+                            foreach (var ep in muxer.GetEndPoints())
+                            {
+                                var srv = muxer.GetServer(ep);
+                                var counters = srv.GetCounters();
+                                Assert.Equal(1, counters.Interactive.SocketCount);
+                                Assert.Equal(1, counters.Subscription.SocketCount);
+                            }
+                        }
                     }
                 }
+                finally
+                {
+                    // Connection info goes at the end...
+                    Output.WriteLine(sw.ToString());
+                }
             }
         }
 

StackExchange.Redis.Tests/xunit.runner.json

 {
   "methodDisplay": "classAndMethod",
-  "maxParallelThreads": 2
+  "maxParallelThreads": 3
 }
\ No newline at end of file

StackExchange.Redis/StackExchange/Redis/ResultProcessor.cs

@@ -152,6 +152,7 @@ public virtual bool SetResult(PhysicalConnection connection, Message message, Ra
                 bool log = !message.IsInternalCall;
                 bool isMoved = result.AssertStarts(MOVED);
                 string err = string.Empty;
+                bool unableToConnectError = false;
                 if (isMoved || result.AssertStarts(ASK))
                 {
                     message.SetResponseReceived();
@@ -178,6 +179,7 @@ public virtual bool SetResult(PhysicalConnection connection, Message message, Ra
                                 }
                                 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.  ";
                                 }
 #if FEATURE_PERFCOUNTER
@@ -198,7 +200,14 @@ public virtual bool SetResult(PhysicalConnection connection, Message message, Ra
                     bridge.Multiplexer.OnErrorMessage(server.EndPoint, err);
                 }
                 connection.Multiplexer.Trace("Completed with error: " + err + " (" + GetType().Name + ")", ToString());
-                ServerFail(message, err);
+                if (unableToConnectError)
+                {
+                    ConnectionFail(message, ConnectionFailureType.UnableToConnect, err);
+                }
+                else
+                {
+                    ServerFail(message, err);
+                }
             }
             else
             {

build.ps1

@@ -3,10 +3,11 @@ param(
     [string] $Version,
     [string] $BuildNumber,
     [bool] $CreatePackages,
+    [switch] $StartServers,
     [bool] $RunTests = $true,
     [string] $PullRequestNumber
 )
-    
+
 function CalculateVersion() {
     if ($Version) {
         return $Version
@@ -64,14 +65,19 @@ if ($PullRequestNumber) {
 }
 
 if ($RunTests) {
+    if ($StartServers) {
+        Write-Host "Starting all servers for testing: $project (all frameworks)" -ForegroundColor "Magenta"
+        & .\RedisConfigs\start-all.cmd
+        Write-Host "Servers Started." -ForegroundColor "Green"
+    }
     dotnet restore /ConsoleLoggerParameters:Verbosity=Quiet
     foreach ($project in $testsToRun) {
         Write-Host "Running tests: $project (all frameworks)" -ForegroundColor "Magenta"
         #Push-Location ".\tests\$project"
         Push-Location ".\$project"
 
-        dotnet xunit -configuration Release
-        if ($LastExitCode -ne 0) { 
+        dotnet xunit -configuration Release -xml ./test-results.xml
+        if ($LastExitCode -ne 0) {
             Write-Host "Error with tests, aborting build." -Foreground "Red"
             Pop-Location
             Exit 1
@@ -93,7 +99,7 @@ if ($CreatePackages) {
 
 foreach ($project in $projectsToBuild) {
     Write-Host "Working on $project`:" -ForegroundColor "Magenta"
-	
+
     #Push-Location ".\src\$project"
     Push-Location ".\$project"
 
@@ -108,7 +114,7 @@ foreach ($project in $projectsToBuild) {
 	Write-Host "$project... (Version:" -NoNewline -ForegroundColor "Magenta"
     Write-Host $semVer -NoNewline -ForegroundColor "Cyan"
     Write-Host ")" -ForegroundColor "Magenta"
-    
+
 
 	dotnet msbuild "/t:$targets" "/p:Configuration=Release" "/p:Version=$semVer" "/p:PackageOutputPath=$packageOutputFolder" "/p:CI=true"