Merge pull request #11150 from bprashanth/scheduler_race

Fix scheduler race
This commit is contained in:
Tim Hockin 2015-07-13 14:47:14 -07:00
commit e71b6f90de

View File

@ -191,5 +191,7 @@ type simpleModelerPods struct {
// List returns pods known and assumed to exist.
func (s simpleModelerPods) List(selector labels.Selector) (pods []*api.Pod, err error) {
return s.simpleModeler.listPods(selector)
s.simpleModeler.LockedAction(
func() { pods, err = s.simpleModeler.listPods(selector) })
return
}