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

Merge pull request #31677 from jianhuiz/federation-replicaset-controller-delay-fix

Browse Source 
Automatic merge from submit-queue

fix deliverer dealy constant usage

some delay constants were not correctly used

#29741
@quinton-hoole @deepak-vij @kshafiee @mwielgus
This commit is contained in:
Kubernetes Submit Queue 2016-09-05 20:52:34 -07:00 committed by GitHub
commit 59a25fb7ed
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
federation/pkg/federation-controller/replicaset/replicasetcontroller.go
View File

@ -57,7 +57,7 @@ var (
replicaSetReviewDelay = 10 * time.Second replicaSetReviewDelay = 10 * time.Second
clusterAvailableDelay = 20 * time.Second clusterAvailableDelay = 20 * time.Second
clusterUnavailableDelay = 60 * time.Second clusterUnavailableDelay = 60 * time.Second
allReplicaSetReviewDealy = 2 * time.Minute allReplicaSetReviewDelay = 2 * time.Minute
updateTimeout = 30 * time.Second updateTimeout = 30 * time.Second
) )
@ -131,13 +131,13 @@ func NewReplicaSetController(federationClient fedclientset.Interface) *ReplicaSe
&extensionsv1.ReplicaSet{}, &extensionsv1.ReplicaSet{},
controller.NoResyncPeriodFunc(), controller.NoResyncPeriodFunc(),
fedutil.NewTriggerOnAllChanges( fedutil.NewTriggerOnAllChanges(
func(obj runtime.Object) { frsc.deliverLocalReplicaSet(obj, allReplicaSetReviewDealy) }, func(obj runtime.Object) { frsc.deliverLocalReplicaSet(obj, replicaSetReviewDelay) },
), ),
) )
} }
clusterLifecycle := fedutil.ClusterLifecycleHandlerFuncs{ clusterLifecycle := fedutil.ClusterLifecycleHandlerFuncs{
ClusterAvailable: func(cluster *fedv1.Cluster) { ClusterAvailable: func(cluster *fedv1.Cluster) {
frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterUnavailableDelay) frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterAvailableDelay)
}, },
ClusterUnavailable: func(cluster *fedv1.Cluster, _ []interface{}) { ClusterUnavailable: func(cluster *fedv1.Cluster, _ []interface{}) {
frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterUnavailableDelay) frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterUnavailableDelay)
@ -159,7 +159,7 @@ func NewReplicaSetController(federationClient fedclientset.Interface) *ReplicaSe
controller.NoResyncPeriodFunc(), controller.NoResyncPeriodFunc(),
fedutil.NewTriggerOnAllChanges( fedutil.NewTriggerOnAllChanges(
func(obj runtime.Object) { func(obj runtime.Object) {
frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, clusterUnavailableDelay) frsc.clusterDeliverer.DeliverAfter(allClustersKey, nil, allReplicaSetReviewDelay)
}, },
), ),
) )

2
federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go
View File

@ -77,7 +77,7 @@ func TestReplicaSetController(t *testing.T) {
replicaSetReviewDelay = 10 * time.Millisecond replicaSetReviewDelay = 10 * time.Millisecond
clusterAvailableDelay = 20 * time.Millisecond clusterAvailableDelay = 20 * time.Millisecond
clusterUnavailableDelay = 60 * time.Millisecond clusterUnavailableDelay = 60 * time.Millisecond
allReplicaSetReviewDealy = 120 * time.Millisecond allReplicaSetReviewDelay = 120 * time.Millisecond
fedclientset := fedclientfake.NewSimpleClientset() fedclientset := fedclientfake.NewSimpleClientset()
fedrswatch := watch.NewFake() fedrswatch := watch.NewFake()