From eb39693d62b786e71050381b5a53f044400f76e7 Mon Sep 17 00:00:00 2001 From: Mark Mandel Date: Wed, 12 Jun 2019 09:52:16 -0700 Subject: [PATCH] Flaky: TestControllerSyncFleetAutoscaler Usual culprit, needs more cache.WaitForSync() --- pkg/fleetautoscalers/controller.go | 4 +++- pkg/fleetautoscalers/controller_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/fleetautoscalers/controller.go b/pkg/fleetautoscalers/controller.go index effb13cff6..cba04cb5c8 100644 --- a/pkg/fleetautoscalers/controller.go +++ b/pkg/fleetautoscalers/controller.go @@ -54,6 +54,7 @@ type Controller struct { crdGetter v1beta1.CustomResourceDefinitionInterface fleetGetter getterv1alpha1.FleetsGetter fleetLister listerv1alpha1.FleetLister + fleetSynced cache.InformerSynced fleetAutoscalerGetter getterv1alpha1.FleetAutoscalersGetter fleetAutoscalerLister listerv1alpha1.FleetAutoscalerLister fleetAutoscalerSynced cache.InformerSynced @@ -77,6 +78,7 @@ func NewController( crdGetter: extClient.ApiextensionsV1beta1().CustomResourceDefinitions(), fleetGetter: agonesClient.StableV1alpha1(), fleetLister: agonesInformer.Fleets().Lister(), + fleetSynced: agonesInformer.Fleets().Informer().HasSynced, fleetAutoscalerGetter: agonesClient.StableV1alpha1(), fleetAutoscalerLister: agonesInformer.FleetAutoscalers().Lister(), fleetAutoscalerSynced: fasInformer.HasSynced, @@ -113,7 +115,7 @@ func (c *Controller) Run(workers int, stop <-chan struct{}) error { } c.baseLogger.Info("Wait for cache sync") - if !cache.WaitForCacheSync(stop, c.fleetAutoscalerSynced) { + if !cache.WaitForCacheSync(stop, c.fleetSynced, c.fleetAutoscalerSynced) { return errors.New("failed to wait for caches to sync") } diff --git a/pkg/fleetautoscalers/controller_test.go b/pkg/fleetautoscalers/controller_test.go index 0115b313e3..a3f25b7958 100644 --- a/pkg/fleetautoscalers/controller_test.go +++ b/pkg/fleetautoscalers/controller_test.go @@ -160,7 +160,7 @@ func TestControllerSyncFleetAutoscaler(t *testing.T) { return true, f, nil }) - _, cancel := agtesting.StartInformers(m, c.fleetAutoscalerSynced) + _, cancel := agtesting.StartInformers(m, c.fleetSynced, c.fleetAutoscalerSynced) defer cancel() err := c.syncFleetAutoscaler("default/fas-1") @@ -214,7 +214,7 @@ func TestControllerSyncFleetAutoscaler(t *testing.T) { return true, f, nil }) - _, cancel := agtesting.StartInformers(m, c.fleetAutoscalerSynced) + _, cancel := agtesting.StartInformers(m, c.fleetSynced, c.fleetAutoscalerSynced) defer cancel() err := c.syncFleetAutoscaler("default/fas-1") @@ -251,7 +251,7 @@ func TestControllerSyncFleetAutoscaler(t *testing.T) { return false, nil, nil }) - _, cancel := agtesting.StartInformers(m, c.fleetAutoscalerSynced) + _, cancel := agtesting.StartInformers(m, c.fleetSynced, c.fleetAutoscalerSynced) defer cancel() err := c.syncFleetAutoscaler(fas.ObjectMeta.Name) @@ -280,7 +280,7 @@ func TestControllerSyncFleetAutoscaler(t *testing.T) { return true, fas, nil }) - _, cancel := agtesting.StartInformers(m, c.fleetAutoscalerSynced) + _, cancel := agtesting.StartInformers(m, c.fleetSynced, c.fleetAutoscalerSynced) defer cancel() err := c.syncFleetAutoscaler("default/fas-1")