mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
increase pv controller resync period to try to deflake api update conflicts
This commit is contained in:
parent
384e45febd
commit
5b1fb221b6
@ -17,7 +17,6 @@ go_test(
|
|||||||
tags = ["integration"],
|
tags = ["integration"],
|
||||||
deps = [
|
deps = [
|
||||||
"//pkg/controller/volume/persistentvolume:go_default_library",
|
"//pkg/controller/volume/persistentvolume:go_default_library",
|
||||||
"//pkg/controller/volume/persistentvolume/options:go_default_library",
|
|
||||||
"//pkg/scheduler/algorithm/predicates:go_default_library",
|
"//pkg/scheduler/algorithm/predicates:go_default_library",
|
||||||
"//pkg/volume:go_default_library",
|
"//pkg/volume:go_default_library",
|
||||||
"//pkg/volume/testing:go_default_library",
|
"//pkg/volume/testing:go_default_library",
|
||||||
|
@ -40,7 +40,6 @@ import (
|
|||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/client-go/util/workqueue"
|
"k8s.io/client-go/util/workqueue"
|
||||||
"k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
|
"k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
|
||||||
persistentvolumeoptions "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/options"
|
|
||||||
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
|
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
|
||||||
"k8s.io/kubernetes/pkg/volume"
|
"k8s.io/kubernetes/pkg/volume"
|
||||||
volumetest "k8s.io/kubernetes/pkg/volume/testing"
|
volumetest "k8s.io/kubernetes/pkg/volume/testing"
|
||||||
@ -926,7 +925,7 @@ func setupCluster(t *testing.T, nsName string, numberOfNodes int, resyncPeriod t
|
|||||||
|
|
||||||
func initPVController(context *testContext, provisionDelaySeconds int) (*persistentvolume.PersistentVolumeController, informers.SharedInformerFactory, error) {
|
func initPVController(context *testContext, provisionDelaySeconds int) (*persistentvolume.PersistentVolumeController, informers.SharedInformerFactory, error) {
|
||||||
clientset := context.clientSet
|
clientset := context.clientSet
|
||||||
// Informers factory for controllers, we disable resync period for testing.
|
// Informers factory for controllers
|
||||||
informerFactory := informers.NewSharedInformerFactory(clientset, 0)
|
informerFactory := informers.NewSharedInformerFactory(clientset, 0)
|
||||||
|
|
||||||
// Start PV controller for volume binding.
|
// Start PV controller for volume binding.
|
||||||
@ -946,10 +945,11 @@ func initPVController(context *testContext, provisionDelaySeconds int) (*persist
|
|||||||
}
|
}
|
||||||
plugins := []volume.VolumePlugin{plugin}
|
plugins := []volume.VolumePlugin{plugin}
|
||||||
|
|
||||||
controllerOptions := persistentvolumeoptions.NewPersistentVolumeControllerOptions()
|
|
||||||
params := persistentvolume.ControllerParameters{
|
params := persistentvolume.ControllerParameters{
|
||||||
KubeClient: clientset,
|
KubeClient: clientset,
|
||||||
SyncPeriod: controllerOptions.PVClaimBinderSyncPeriod,
|
// Use a frequent resync period to retry API update conflicts due to
|
||||||
|
// https://github.com/kubernetes/kubernetes/issues/85320
|
||||||
|
SyncPeriod: 5 * time.Second,
|
||||||
VolumePlugins: plugins,
|
VolumePlugins: plugins,
|
||||||
Cloud: nil,
|
Cloud: nil,
|
||||||
ClusterName: "volume-test-cluster",
|
ClusterName: "volume-test-cluster",
|
||||||
|
Loading…
Reference in New Issue
Block a user