Merge pull request #5170 from gyuho/tester

etcd-tester: flag consistency-check

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

@@ -33,7 +33,7 @@ func main() {
 	stressKeySuffixRange := flag.Int("stress-key-count", 250000, "the count of key range written into etcd.")
 	limit := flag.Int("limit", 3, "the limit of rounds to run failure set.")
 	schedCases := flag.String("schedule-cases", "", "test case schedule")
-
+	consistencyCheck := flag.Bool("consistency-check", true, "true to check consistency (revision, hash)")
 	isV2Only := flag.Bool("v2-only", false, "'true' to run V2 only tester.")
 	flag.Parse()
 
@@ -73,9 +73,10 @@ func main() {
 	}
 
 	t := &tester{
-		failures: schedule,
-		cluster:  c,
-		limit:    *limit,
+		failures:         schedule,
+		cluster:          c,
+		limit:            *limit,
+		consistencyCheck: *consistencyCheck,
 	}
 
 	sh := statusHandler{status: &t.status}

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

@@ -20,9 +20,10 @@ import (
 )
 
 type tester struct {
-	failures []failure
-	cluster  *cluster
-	limit    int
+	failures         []failure
+	cluster          *cluster
+	limit            int
+	consistencyCheck bool
 
 	status Status
 }
@@ -81,6 +82,9 @@ func (tt *tester) runLoop() {
 			}
 			plog.Printf("[round#%d case#%d] recovered failure", i, j)
 
+			if !tt.consistencyCheck {
+				continue
+			}
 			if tt.cluster.v2Only {
 				plog.Printf("[round#%d case#%d] succeed!", i, j)
 				continue