mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-12-07 18:06:21 +00:00
fca65dcd64
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. avoid dobule RLock() in cpumanager **What this PR does / why we need it**: We met a deadlock when removing pod. kubelet keeps logging: ``` Pod "xxxx" is terminated, but some containers are still running ``` After debug, we found it stuck in `SetDefaultCPUSet` [here](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/cm/cpumanager/policy_static.go#L184) while another goroutine are calling `GetCPUSetOrDefault` [here](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/cm/cpumanager/cpu_manager.go#L256). According golang/go#15418, It is not safe to double RLock a RWMutex. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: none **Special notes for your reviewer**: **Release note**: ```release-note removed unsafe double RLock in cpumanager ```