github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

kubelet/kuberuntime: use sync.OnceValue

Browse Source 
This was added to Go 1.21, and makes the code simpler.

(Best reviewed ignoring changes in amount of whitespace).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2024-11-07 13:09:09 -08:00
parent 3a1b0f2864
commit 19477b7eed
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/kubelet/kuberuntime/kuberuntime_container_linux.go
View File

@ -338,42 +338,35 @@ var isCgroup2UnifiedMode = func() bool {
return libcontainercgroups.IsCgroup2UnifiedMode() return libcontainercgroups.IsCgroup2UnifiedMode()
} }
var (
swapControllerAvailability bool
swapControllerAvailabilityOnce sync.Once
)
// Note: this function variable is being added here so it would be possible to mock // Note: this function variable is being added here so it would be possible to mock
// the swap controller availability for unit tests by assigning a new function to it. Without it, // the swap controller availability for unit tests by assigning a new function to it. Without it,
// the swap controller availability would solely depend on the environment running the test. // the swap controller availability would solely depend on the environment running the test.
var swapControllerAvailable = func() bool { var swapControllerAvailable = sync.OnceValue(func() bool {
// See https://github.com/containerd/containerd/pull/7838/ // See https://github.com/containerd/containerd/pull/7838/
swapControllerAvailabilityOnce.Do(func() { const warn = "Failed to detect the availability of the swap controller, assuming not available"
const warn = "Failed to detect the availability of the swap controller, assuming not available" p := "/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes"
p := "/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes" if isCgroup2UnifiedMode() {
if isCgroup2UnifiedMode() { // memory.swap.max does not exist in the cgroup root, so we check /sys/fs/cgroup/<SELF>/memory.swap.max
// memory.swap.max does not exist in the cgroup root, so we check /sys/fs/cgroup/<SELF>/memory.swap.max cm, err := libcontainercgroups.ParseCgroupFile("/proc/self/cgroup")
cm, err := libcontainercgroups.ParseCgroupFile("/proc/self/cgroup") if err != nil {
if err != nil { klog.V(5).ErrorS(fmt.Errorf("failed to parse /proc/self/cgroup: %w", err), warn)
klog.V(5).ErrorS(fmt.Errorf("failed to parse /proc/self/cgroup: %w", err), warn) return false
return
}
// Fr cgroup v2 unified hierarchy, there are no per-controller
// cgroup paths, so the cm map returned by ParseCgroupFile above
// has a single element where the key is empty string ("") and
// the value is the cgroup path the <pid> is in.
p = filepath.Join("/sys/fs/cgroup", cm[""], "memory.swap.max")
} }
if _, err := os.Stat(p); err != nil { // Fr cgroup v2 unified hierarchy, there are no per-controller
if !errors.Is(err, os.ErrNotExist) { // cgroup paths, so the cm map returned by ParseCgroupFile above
klog.V(5).ErrorS(err, warn) // has a single element where the key is empty string ("") and
} // the value is the cgroup path the <pid> is in.
return p = filepath.Join("/sys/fs/cgroup", cm[""], "memory.swap.max")
}
if _, err := os.Stat(p); err != nil {
if !errors.Is(err, os.ErrNotExist) {
klog.V(5).ErrorS(err, warn)
} }
swapControllerAvailability = true return false
}) }
return swapControllerAvailability
} return true
})
type swapConfigurationHelper struct { type swapConfigurationHelper struct {
machineInfo cadvisorv1.MachineInfo machineInfo cadvisorv1.MachineInfo