Merge pull request etcd-io#18930 from serathius/robustness-jitter

Add jitter to failpoint injection to cover periodily executed compaction

tests/robustness/main_test.go

@@ -39,6 +39,12 @@ import (
 
 var testRunner = framework.E2eTestRunner
 
+var (
+	WaitBeforeFailpoint = time.Second
+	WaitJitter          = traffic.CompactionPeriod
+	WaitAfterFailpoint  = time.Second
+)
+
 func TestMain(m *testing.M) {
 	rand.Seed(time.Now().UnixNano())
 	testRunner.TestMain(m)
@@ -116,14 +122,14 @@ func runScenario(ctx context.Context, t *testing.T, s scenarios.TestScenario, lg
 	g.Go(func() error {
 		defer close(failpointInjected)
 		// Give some time for traffic to reach qps target before injecting failpoint.
-		time.Sleep(time.Second)
+		time.Sleep(randomizeTime(WaitBeforeFailpoint, WaitJitter))
 		fr, err := failpoint.Inject(ctx, t, lg, clus, s.Failpoint, baseTime, ids)
 		if err != nil {
 			t.Error(err)
 			cancel()
 		}
 		// Give some time for traffic to reach qps target after injecting failpoint.
-		time.Sleep(time.Second)
+		time.Sleep(randomizeTime(WaitAfterFailpoint, WaitJitter))
 		if fr != nil {
 			failpointInjected <- fr.FailpointInjection
 			failpointClientReport = fr.Client
@@ -147,6 +153,10 @@ func runScenario(ctx context.Context, t *testing.T, s scenarios.TestScenario, lg
 	return append(operationReport, append(failpointClientReport, watchReport...)...)
 }
 
+func randomizeTime(base time.Duration, jitter time.Duration) time.Duration {
+	return base - jitter + time.Duration(rand.Int63n(int64(jitter)*2))
+}
+
 func operationsMaxRevision(reports []report.ClientReport) int64 {
 	var maxRevision int64
 	for _, r := range reports {

tests/robustness/traffic/traffic.go

@@ -37,20 +37,19 @@ var (
 	RequestTimeout          = 200 * time.Millisecond
 	WatchTimeout            = time.Second
 	MultiOpTxnOpCount       = 4
+	CompactionPeriod        = 200 * time.Millisecond
 
 	LowTraffic = Profile{
 		MinimalQPS:                     100,
 		MaximalQPS:                     200,
 		ClientCount:                    8,
 		MaxNonUniqueRequestConcurrency: 3,
-		CompactPeriod:                  200 * time.Millisecond,
 	}
 	HighTrafficProfile = Profile{
 		MinimalQPS:                     200,
 		MaximalQPS:                     1000,
 		ClientCount:                    8,
 		MaxNonUniqueRequestConcurrency: 3,
-		CompactPeriod:                  200 * time.Millisecond,
 	}
 )
 
@@ -97,7 +96,7 @@ func SimulateTraffic(ctx context.Context, t *testing.T, lg *zap.Logger, clus *e2
 			defer wg.Done()
 			defer c.Close()
 
-			RunCompactLoop(ctx, c, profile.CompactPeriod, finish)
+			RunCompactLoop(ctx, c, CompactionPeriod, finish)
 			mux.Lock()
 			reports = append(reports, c.Report())
 			mux.Unlock()
@@ -177,7 +176,6 @@ type Profile struct {
 	MaxNonUniqueRequestConcurrency int
 	ClientCount                    int
 	ForbidCompaction               bool
-	CompactPeriod                  time.Duration
 }
 
 func (p Profile) WithoutCompaction() Profile {