Fix the naming check.

grpc · Dec 29, 2024 · 5ef8eca · 5ef8eca
1 parent 1282e49
commit 5ef8eca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/interop/client/client.go b/interop/client/client.go
@@ -364,7 +364,7 @@ func main() {
 			ResponseSize:                     *soakResponseSize,
 			PerIterationMaxAcceptableLatency: time.Duration(*soakPerIterationMaxAcceptableLatencyMs) * time.Millisecond,
 			MinTimeBetweenRPCs:               time.Duration(*soakMinTimeMsBetweenRPCs) * time.Millisecond,
-			OverallTimeoutSeconds:            time.Duration(*soakOverallTimeoutSeconds) * time.Second,
+			OverallTimeout:                   time.Duration(*soakOverallTimeoutSeconds) * time.Second,
 			ServerAddr:                       serverAddr,
 			NumWorkers:                       *soakNumWorkers,
 			Iterations:                       *soakIterations,
@@ -380,7 +380,7 @@ func main() {
 			ResponseSize:                     *soakResponseSize,
 			PerIterationMaxAcceptableLatency: time.Duration(*soakPerIterationMaxAcceptableLatencyMs) * time.Millisecond,
 			MinTimeBetweenRPCs:               time.Duration(*soakMinTimeMsBetweenRPCs) * time.Millisecond,
-			OverallTimeoutSeconds:            time.Duration(*soakOverallTimeoutSeconds) * time.Second,
+			OverallTimeout:                   time.Duration(*soakOverallTimeoutSeconds) * time.Second,
 			ServerAddr:                       serverAddr,
 			NumWorkers:                       *soakNumWorkers,
 			Iterations:                       *soakIterations,

diff --git a/interop/test_utils.go b/interop/test_utils.go
@@ -709,7 +709,7 @@ type SoakTestConfig struct {
 	ResponseSize                     int
 	PerIterationMaxAcceptableLatency time.Duration
 	MinTimeBetweenRPCs               time.Duration
-	OverallTimeoutSeconds            time.Duration
+	OverallTimeout                   time.Duration
 	ServerAddr                       string
 	NumWorkers                       int
 	Iterations                       int
@@ -779,15 +779,15 @@ func doOneSoakIteration(ctx context.Context, config SoakIterationConfig) (latenc
 }
 
 func executeSoakTestInWorker(ctx context.Context, config SoakTestConfig, startTime time.Time, workerID int, workerResults *WorkerResults) {
-	timeoutDuration := config.OverallTimeoutSeconds
+	timeoutDuration := config.OverallTimeout
 	currentChannel := config.SharedChannel
 	soakIterationsPerWorker := config.Iterations / config.NumWorkers
 	for i := 0; i < soakIterationsPerWorker; i++ {
 		if ctx.Err() != nil {
 			return
 		}
 		if time.Since(startTime) >= timeoutDuration {
-			fmt.Printf("Test exceeded overall timeout of %v, stopping...\n", config.OverallTimeoutSeconds)
+			fmt.Printf("Test exceeded overall timeout of %v, stopping...\n", config.OverallTimeout)
 			return
 		}
 		earliestNextStart := time.After(config.MinTimeBetweenRPCs)
@@ -872,7 +872,7 @@ func DoSoakTest(ctx context.Context, soakConfig SoakTestConfig) {
 		soakConfig.ServerAddr, totalIterations, soakConfig.Iterations, totalFailures, b.String())
 
 	if totalIterations != soakConfig.Iterations {
-		fmt.Fprintf(os.Stderr, "Soak test consumed all %v of time and quit early, ran %d out of %d iterations.\n", soakConfig.OverallTimeoutSeconds, totalIterations, soakConfig.Iterations)
+		fmt.Fprintf(os.Stderr, "Soak test consumed all %v of time and quit early, ran %d out of %d iterations.\n", soakConfig.OverallTimeout, totalIterations, soakConfig.Iterations)
 	}
 
 	if totalFailures > soakConfig.MaxFailures {

diff --git a/interop/xds_federation/client.go b/interop/xds_federation/client.go
@@ -134,7 +134,7 @@ func main() {
 				ResponseSize:                     *soakResponseSize,
 				PerIterationMaxAcceptableLatency: time.Duration(*soakPerIterationMaxAcceptableLatencyMs) * time.Millisecond,
 				MinTimeBetweenRPCs:               time.Duration(*soakMinTimeMsBetweenRPCs) * time.Millisecond,
-				OverallTimeoutSeconds:            time.Duration(*soakOverallTimeoutSeconds) * time.Second,
+				OverallTimeout:                   time.Duration(*soakOverallTimeoutSeconds) * time.Second,
 				ServerAddr:                       c.uri,
 				NumWorkers:                       *soakNumWorkers,
 				Iterations:                       *soakIterations,