Merge pull request #1098 from judemars/fix_backoff_threshold

k8s-ci-robot · web-flow · commit d0dd0d424848 · 2022-12-05T12:05:03.000-08:00
Fix micro &gt; milli max backoff bug
diff --git a/cmd/gce-pd-csi-driver/main.go b/cmd/gce-pd-csi-driver/main.go
@@ -127,7 +127,7 @@ func handle() {
 			klog.Fatalf("Failed to get cloud provider: %w", err)
 		}
 		initialBackoffDuration := time.Duration(*errorBackoffInitialDurationMs) * time.Millisecond
-		maxBackoffDuration := time.Duration(*errorBackoffMaxDurationMs) * time.Microsecond
+		maxBackoffDuration := time.Duration(*errorBackoffMaxDurationMs) * time.Millisecond
 		controllerServer = driver.NewControllerServer(gceDriver, cloudProvider, initialBackoffDuration, maxBackoffDuration)
 	} else if *cloudConfigFilePath != "" {
 		klog.Warningf("controller service is disabled but cloud config given - it has no effect")

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func handle() {`
`127`	`127`	`klog.Fatalf("Failed to get cloud provider: %w", err)`
`128`	`128`	`}`
`129`	`129`	`initialBackoffDuration := time.Duration(errorBackoffInitialDurationMs) time.Millisecond`
`130`		`- maxBackoffDuration := time.Duration(errorBackoffMaxDurationMs) time.Microsecond`
	`130`	`+ maxBackoffDuration := time.Duration(errorBackoffMaxDurationMs) time.Millisecond`
`131`	`131`	`controllerServer = driver.NewControllerServer(gceDriver, cloudProvider, initialBackoffDuration, maxBackoffDuration)`
`132`	`132`	`} else if *cloudConfigFilePath != "" {`
`133`	`133`	`klog.Warningf("controller service is disabled but cloud config given - it has no effect")`