Merge bcac126 into a573364

tikv · Dec 28, 2018 · 8cf5763 · 8cf5763
2 parents a573364 + bcac126
commit 8cf5763
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/pkg/tempurl/tempurl.go b/pkg/tempurl/tempurl.go
@@ -31,6 +31,7 @@ var (
 func Alloc() string {
 	for i := 0; i < 10; i++ {
 		if u := tryAllocTestURL(); u != "" {
+			log.Infof("alloc url: %s", u)
 			return u
 		}
 		time.Sleep(time.Second)

diff --git a/tests/cluster.go b/tests/cluster.go
@@ -16,6 +16,7 @@ package tests
 import (
 	"context"
 	"os"
+	"strings"
 	"sync"
 	"time"
 
@@ -293,7 +294,19 @@ func NewTestCluster(initialServerCount int, opts ...ConfigOption) (*TestCluster,
 // RunServer starts to run TestServer.
 func (c *TestCluster) RunServer(ctx context.Context, server *TestServer) <-chan error {
 	resC := make(chan error)
-	go func() { resC <- server.Run(ctx) }()
+	go func() {
+		var err error
+		for i := 0; i < 10; i++ {
+			err = server.Run(ctx)
+			// retryable error
+			if err != nil && strings.Contains(err.Error(), "address already in use") {
+				time.Sleep(time.Second)
+				continue
+			}
+			break
+		}
+		resC <- err
+	}()
 	return resC
 }