Stop the bleeding for #6059

lavalamp · brendandburns · commit c7b7e089b55c · 2015-04-07T17:02:34.000-07:00
(cherry picked from commit 6be09c5)
diff --git a/pkg/kubelet/config/apiserver.go b/pkg/kubelet/config/apiserver.go
@@ -18,6 +18,8 @@ limitations under the License.
 package config
 
 import (
+	"time"
+
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache"
@@ -40,7 +42,9 @@ func newSourceApiserverFromLW(lw cache.ListerWatcher, updates chan<- interface{}
 		}
 		updates <- kubelet.PodUpdate{pods, kubelet.SET, kubelet.ApiserverSource}
 	}
-	cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 0).Run()
+	// TODO: the 30 second poll loop is here to mitigate #6059 and
+	// shouldn't be neeeded once that is resolved.
+	cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 30*time.Second).Run()
 }
 
 func getHostFieldLabel(apiVersion string) string {
diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go
@@ -138,7 +138,9 @@ func (f *ConfigFactory) CreateFromKeys(predicateKeys, priorityKeys util.StringSe
 	}
 
 	// Watch and queue pods that need scheduling.
-	cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 0).Run()
+	// TODO: the 30 second poll loop is here to mitigate #6059 and
+	// shouldn't be neeeded once that is resolved.
+	cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 30*time.Second).Run()
 
 	// Pass through all events to the scheduled pod store, but on a deletion,
 	// also remove from the assumed pods.

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ limitations under the License.`
`18`	`18`	`package config`
`19`	`19`
`20`	`20`	`import (`
	`21`	`+ "time"`
	`22`	`+`
`21`	`23`	`"github.com/GoogleCloudPlatform/kubernetes/pkg/api"`
`22`	`24`	`"github.com/GoogleCloudPlatform/kubernetes/pkg/client"`
`23`	`25`	`"github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache"`
`@@ -40,7 +42,9 @@ func newSourceApiserverFromLW(lw cache.ListerWatcher, updates chan<- interface{}`
`40`	`42`	`}`
`41`	`43`	`updates <- kubelet.PodUpdate{pods, kubelet.SET, kubelet.ApiserverSource}`
`42`	`44`	`}`
`43`		`- cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 0).Run()`
	`45`	`+ // TODO: the 30 second poll loop is here to mitigate #6059 and`
	`46`	`+ // shouldn't be neeeded once that is resolved.`
	`47`	`+ cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 30*time.Second).Run()`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`func getHostFieldLabel(apiVersion string) string {`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,9 @@ func (f *ConfigFactory) CreateFromKeys(predicateKeys, priorityKeys util.StringSe`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// Watch and queue pods that need scheduling.`
`141`		`- cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 0).Run()`
	`141`	`+ // TODO: the 30 second poll loop is here to mitigate #6059 and`
	`142`	`+ // shouldn't be neeeded once that is resolved.`
	`143`	`+ cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 30*time.Second).Run()`
`142`	`144`
`143`	`145`	`// Pass through all events to the scheduled pod store, but on a deletion,`
`144`	`146`	`// also remove from the assumed pods.`