etcd-runner: refactor round code

tools/functional-tester/etcd-runner/main.go

@@ -36,7 +36,7 @@ func main() {
 	log.SetFlags(log.Lmicroseconds)
 
 	endpointStr := flag.String("endpoints", "localhost:2379", "endpoints of etcd cluster")
-	mode := flag.String("mode", "lock-racer", "test mode (lock-racer)")
+	mode := flag.String("mode", "lock-racer", "test mode (lock-racer, lease-renewer)")
 	round := flag.Int("rounds", 100, "number of rounds to run")
 	flag.Parse()
 	eps := strings.Split(*endpointStr, ",")
@@ -94,83 +94,28 @@ func runLeaseRenewer(eps []string) {
 }
 
 func runRacer(eps []string, round int) {
-	nrace := 15
+	rcs := make([]roundClient, 15)
-	prefix := "racers"
-	racers := make([]*concurrency.Mutex, nrace)
-	clis := make([]*clientv3.Client, nrace)
-	progress := make([]int, nrace)
-	finished := make(chan struct{}, 0)
-
-	var (
-		mu  sync.Mutex
-		cnt int
-	)
 	ctx := context.Background()
-
+	cnt := 0
-	var wg sync.WaitGroup
+	for i := range rcs {
-
+		rcs[i].c = randClient(eps)
-	for i := range racers {
+		m := concurrency.NewMutex(rcs[i].c, "racers")
-		clis[i] = randClient(eps)
+		rcs[i].acquire = func() error { return m.Lock(ctx) }
-		racers[i] = concurrency.NewMutex(clis[i], prefix)
+		rcs[i].validate = func() error {
-		wg.Add(1)
+			if cnt++; cnt != 1 {
-
+				return fmt.Errorf("bad lock; count: %d", cnt)
-		go func(i int) {
-			defer wg.Done()
-
-			for {
-				if progress[i] >= round {
-					return
 			}
-
+			return nil
-				for {
-					err := racers[i].Lock(ctx)
-					if err == nil {
-						break
-					}
-				}
-
-				mu.Lock()
-				if cnt > 0 {
-					log.Fatalf("bad lock")
-				}
-				cnt = 1
-				mu.Unlock()
-
-				time.Sleep(10 * time.Millisecond)
-				progress[i]++
-				finished <- struct{}{}
-
-				mu.Lock()
-				for {
-					err := racers[i].Unlock()
-					if err == nil {
-						break
 		}
+		rcs[i].release = func() error {
+			if err := m.Unlock(); err != nil {
+				return err
 			}
 			cnt = 0
-				mu.Unlock()
+			return nil
-			}
-		}(i)
-	}
-
-	start := time.Now()
-	for i := 1; i < nrace*round+1; i++ {
-		select {
-		case <-finished:
-			if i%100 == 0 {
-				fmt.Printf("finished %d, took %v\n", i, time.Since(start))
-				start = time.Now()
-			}
-		case <-time.After(time.Minute):
-			log.Panic("no progress after 1 minute!")
 		}
 	}
-
+	doRounds(rcs, round)
-	wg.Wait()
-
-	for _, cli := range clis {
-		cli.Close()
-	}
 }
 
 func randClient(eps []string) *clientv3.Client {
@@ -191,3 +136,63 @@ func randClient(eps []string) *clientv3.Client {
 	}
 	return c
 }
+
+type roundClient struct {
+	c        *clientv3.Client
+	progress int
+	acquire  func() error
+	validate func() error
+	release  func() error
+}
+
+func doRounds(rcs []roundClient, rounds int) {
+	var mu sync.Mutex
+	var wg sync.WaitGroup
+
+	wg.Add(len(rcs))
+	finished := make(chan struct{}, 0)
+	for i := range rcs {
+		go func(rc *roundClient) {
+			defer wg.Done()
+			for rc.progress < rounds {
+				for rc.acquire() != nil { /* spin */
+				}
+
+				mu.Lock()
+				if err := rc.validate(); err != nil {
+					log.Fatal(err)
+				}
+				mu.Unlock()
+
+				time.Sleep(10 * time.Millisecond)
+				rc.progress++
+				finished <- struct{}{}
+
+				mu.Lock()
+				for rc.release() != nil {
+					mu.Unlock()
+					mu.Lock()
+				}
+				mu.Unlock()
+			}
+		}(&rcs[i])
+	}
+
+	start := time.Now()
+	for i := 1; i < len(rcs)*rounds+1; i++ {
+		select {
+		case <-finished:
+			if i%100 == 0 {
+				fmt.Printf("finished %d, took %v\n", i, time.Since(start))
+				start = time.Now()
+			}
+		case <-time.After(time.Minute):
+			log.Panic("no progress after 1 minute!")
+		}
+	}
+
+	wg.Wait()
+	for _, rc := range rcs {
+		rc.c.Close()
+	}
+}