perf: 🚀 Increase CNI Lock Timeout to 30 seconds for Linux AKS. (#2101)

behzad-mir · web-flow · commit 9a3c50cac7b4 · 2023-08-17T00:16:55.000Z
* Increase Linux Lock Timout to 30 seconds.

* addressing the comment by adding a new lock constant for Linux.
diff --git a/cni/plugin.go b/cni/plugin.go
@@ -194,7 +194,7 @@ func (plugin *Plugin) InitializeKeyValueStore(config *common.PluginConfig) error
 	}
 
 	// Acquire store lock. For windows 1m timeout is used while for Linux 10s timeout is assigned.
-	var lockTimeoutValue time.Duration = store.DefaultLockTimeout
+	var lockTimeoutValue time.Duration = store.DefaultLockTimeoutLinux
 	if runtime.GOOS == "windows" {
 		lockTimeoutValue = store.DefaultLockTimeoutWindows
 	}
diff --git a/store/json.go b/store/json.go
@@ -24,6 +24,7 @@ const (
 
 	// DefaultLockTimeout - lock timeout in milliseconds
 	DefaultLockTimeout        = 10000 * time.Millisecond
+	DefaultLockTimeoutLinux   = 30000 * time.Millisecond
 	DefaultLockTimeoutWindows = 60000 * time.Millisecond
 )
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func (plugin Plugin) InitializeKeyValueStore(config common.PluginConfig) error`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`// Acquire store lock. For windows 1m timeout is used while for Linux 10s timeout is assigned.`
`197`		`- var lockTimeoutValue time.Duration = store.DefaultLockTimeout`
	`197`	`+ var lockTimeoutValue time.Duration = store.DefaultLockTimeoutLinux`
`198`	`198`	`if runtime.GOOS == "windows" {`
`199`	`199`	`lockTimeoutValue = store.DefaultLockTimeoutWindows`
`200`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ const (`
`24`	`24`
`25`	`25`	`// DefaultLockTimeout - lock timeout in milliseconds`
`26`	`26`	`DefaultLockTimeout = 10000 * time.Millisecond`
	`27`	`+ DefaultLockTimeoutLinux = 30000 * time.Millisecond`
`27`	`28`	`DefaultLockTimeoutWindows = 60000 * time.Millisecond`
`28`	`29`	`)`
`29`	`30`