github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Avoid MockPodsListWatch deadlock of blocked channel while lock is hold

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2015-11-05 13:20:29 +01:00
parent 1831a057f1
commit 9b00b7ef35
1 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
contrib/mesos/pkg/scheduler/plugin_test.go
View File

@ -184,7 +184,8 @@ func (lw *MockPodsListWatch) Pods() api.PodList {
lw.lock.Lock()
defer lw.lock.Unlock()
return lw.list
obj, _ := api.Scheme.DeepCopy(&lw.list)
return *(obj.(*api.PodList))
}
func (lw *MockPodsListWatch) Pod(name string) *api.Pod {
@ -200,44 +201,56 @@ func (lw *MockPodsListWatch) Pod(name string) *api.Pod {
return nil
}
func (lw *MockPodsListWatch) Add(pod *api.Pod, notify bool) {
lw.lock.Lock()
defer lw.lock.Unlock()
func() {
lw.lock.Lock()
defer lw.lock.Unlock()
lw.list.Items = append(lw.list.Items, *pod)
}()
lw.list.Items = append(lw.list.Items, *pod)
if notify {
lw.fakeWatcher.Add(pod)
}
}
func (lw *MockPodsListWatch) Modify(pod *api.Pod, notify bool) {
lw.lock.Lock()
defer lw.lock.Unlock()
found := false
func() {
lw.lock.Lock()
defer lw.lock.Unlock()
for i, otherPod := range lw.list.Items {
if otherPod.Name == pod.Name {
lw.list.Items[i] = *pod
if notify {
lw.fakeWatcher.Modify(pod)
for i, otherPod := range lw.list.Items {
if otherPod.Name == pod.Name {
lw.list.Items[i] = *pod
found = true
return
}
return
}
log.Fatalf("Cannot find pod %v to modify in MockPodsListWatch", pod.Name)
}()
if notify && found {
lw.fakeWatcher.Modify(pod)
}
log.Fatalf("Cannot find pod %v to modify in MockPodsListWatch", pod.Name)
}
func (lw *MockPodsListWatch) Delete(pod *api.Pod, notify bool) {
lw.lock.Lock()
defer lw.lock.Unlock()
var notifyPod *api.Pod
func() {
lw.lock.Lock()
defer lw.lock.Unlock()
for i, otherPod := range lw.list.Items {
if otherPod.Name == pod.Name {
lw.list.Items = append(lw.list.Items[:i], lw.list.Items[i+1:]...)
if notify {
lw.fakeWatcher.Delete(&otherPod)
for i, otherPod := range lw.list.Items {
if otherPod.Name == pod.Name {
lw.list.Items = append(lw.list.Items[:i], lw.list.Items[i+1:]...)
notifyPod = &otherPod
return
}
return
}
log.Fatalf("Cannot find pod %v to delete in MockPodsListWatch", pod.Name)
}()
if notifyPod != nil && notify {
lw.fakeWatcher.Delete(notifyPod)
}
log.Fatalf("Cannot find pod %v to delete in MockPodsListWatch", pod.Name)
}
// Create a pod with a given index, requiring one port