From 3ba0c0578ea9ad824997f6a17012e86ebf691e01 Mon Sep 17 00:00:00 2001 From: jianhuiz Date: Mon, 29 Aug 2016 22:37:45 -0700 Subject: [PATCH] fix deliverer dealy constant usage --- .../replicaset/replicasetcontroller.go | 8 ++++---- .../replicaset/replicasetcontroller_test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go index cbd6f3a1969..b6bd7d610cd 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go @@ -55,7 +55,7 @@ var ( replicaSetReviewDelay = 10 * time.Second clusterAvailableDelay = 20 * time.Second clusterUnavailableDelay = 60 * time.Second - allReplicaSetReviewDealy = 2 * time.Minute + allReplicaSetReviewDelay = 2 * time.Minute updateTimeout = 30 * time.Second ) @@ -122,13 +122,13 @@ func NewReplicaSetController(federationClient fedclientset.Interface) *ReplicaSe &extensionsv1.ReplicaSet{}, controller.NoResyncPeriodFunc(), fedutil.NewTriggerOnAllChanges( - func(obj runtime.Object) { frsc.deliverLocalReplicaSet(obj, allReplicaSetReviewDealy) }, + func(obj runtime.Object) { frsc.deliverLocalReplicaSet(obj, replicaSetReviewDelay) }, ), ) } clusterLifecycle := fedutil.ClusterLifecycleHandlerFuncs{ ClusterAvailable: func(cluster *fedv1.Cluster) { - frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterUnavailableDelay) + frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterAvailableDelay) }, ClusterUnavailable: func(cluster *fedv1.Cluster, _ []interface{}) { frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterUnavailableDelay) @@ -150,7 +150,7 @@ func NewReplicaSetController(federationClient fedclientset.Interface) *ReplicaSe controller.NoResyncPeriodFunc(), fedutil.NewTriggerOnAllChanges( func(obj runtime.Object) { - frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterUnavailableDelay) + frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, allReplicaSetReviewDelay) }, ), ) diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go index 79b0b7ce8b9..c5daf35918a 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go @@ -77,7 +77,7 @@ func TestReplicaSetController(t *testing.T) { replicaSetReviewDelay = 10 * time.Millisecond clusterAvailableDelay = 20 * time.Millisecond clusterUnavailableDelay = 60 * time.Millisecond - allReplicaSetReviewDealy = 120 * time.Millisecond + allReplicaSetReviewDelay = 120 * time.Millisecond fedclientset := fedclientfake.NewSimpleClientset() fedrswatch := watch.NewFake()