github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix locking issue in pod manager

pull/6/head
Yu-Ju Hong 2015-04-15 11:39:57 -07:00
parent 902e1196ac
commit 967405f0bb
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubelet/pod_manager.go
View File

@ -249,22 +249,25 @@ func (self *basicPodManager) TranslatePodUID(uid types.UID) types.UID {
return uid return uid
} }
func (self *basicPodManager) getFullNameMaps() (map[string]*api.Pod, map[string]*api.Pod) { func (self *basicPodManager) getOrphanedMirrorPodNames() []string {
self.lock.RLock() self.lock.RLock()
defer self.lock.RUnlock() defer self.lock.RUnlock()
return self.podByFullName, self.mirrorPodByFullName var podFullNames []string
for podFullName := range self.mirrorPodByFullName {
if _, ok := self.podByFullName[podFullName]; !ok {
podFullNames = append(podFullNames, podFullName)
}
}
return podFullNames
} }
// Delete all mirror pods which do not have associated static pods. This method // Delete all mirror pods which do not have associated static pods. This method
// sends deletion requets to the API server, but does NOT modify the internal // sends deletion requets to the API server, but does NOT modify the internal
// pod storage in basicPodManager. // pod storage in basicPodManager.
func (self *basicPodManager) DeleteOrphanedMirrorPods() { func (self *basicPodManager) DeleteOrphanedMirrorPods() {
podByFullName, mirrorPodByFullName := self.getFullNameMaps() podFullNames := self.getOrphanedMirrorPodNames()
for _, podFullName := range podFullNames {
for podFullName := range mirrorPodByFullName { self.mirrorClient.DeleteMirrorPod(podFullName)
if _, ok := podByFullName[podFullName]; !ok {
self.mirrorClient.DeleteMirrorPod(podFullName)
}
} }
} }