diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler.go b/pkg/kubelet/volumemanager/reconciler/reconciler.go index e78752b9407..dfacf036f41 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler.go @@ -75,8 +75,6 @@ type Reconciler interface { // this node, and therefore the volume manager should not // loopSleepDuration - the amount of time the reconciler loop sleeps between // successive executions -// syncDuration - the amount of time the syncStates sleeps between -// successive executions // waitForAttachTimeout - the amount of time the Mount function will wait for // the volume to be attached // nodeName - the Name for this node, used by Attach and Detach methods @@ -94,7 +92,6 @@ func NewReconciler( kubeClient clientset.Interface, controllerAttachDetachEnabled bool, loopSleepDuration time.Duration, - syncDuration time.Duration, waitForAttachTimeout time.Duration, nodeName types.NodeName, desiredStateOfWorld cache.DesiredStateOfWorld, @@ -108,7 +105,6 @@ func NewReconciler( kubeClient: kubeClient, controllerAttachDetachEnabled: controllerAttachDetachEnabled, loopSleepDuration: loopSleepDuration, - syncDuration: syncDuration, waitForAttachTimeout: waitForAttachTimeout, nodeName: nodeName, desiredStateOfWorld: desiredStateOfWorld, diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go index 8d2b82c17b3..88cfaf39e52 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go @@ -46,8 +46,7 @@ import ( const ( // reconcilerLoopSleepDuration is the amount of time the reconciler loop // waits between successive executions - reconcilerLoopSleepDuration time.Duration = 1 * time.Nanosecond - reconcilerSyncStatesSleepPeriod time.Duration = 10 * time.Minute + reconcilerLoopSleepDuration time.Duration = 1 * time.Nanosecond // waitForAttachTimeout is the maximum amount of time a // operationexecutor.Mount call will wait for a volume to be attached. waitForAttachTimeout time.Duration = 1 * time.Second @@ -78,7 +77,6 @@ func Test_Run_Positive_DoNothing(t *testing.T) { kubeClient, false, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -122,7 +120,6 @@ func Test_Run_Positive_VolumeAttachAndMount(t *testing.T) { kubeClient, false, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -200,7 +197,6 @@ func Test_Run_Positive_VolumeMountControllerAttachEnabled(t *testing.T) { kubeClient, true, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -279,7 +275,6 @@ func Test_Run_Positive_VolumeAttachMountUnmountDetach(t *testing.T) { kubeClient, false, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -369,7 +364,6 @@ func Test_Run_Positive_VolumeUnmountControllerAttachEnabled(t *testing.T) { kubeClient, true, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -460,7 +454,6 @@ func Test_Run_Positive_VolumeAttachAndMap(t *testing.T) { kubeClient, false, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -545,7 +538,6 @@ func Test_Run_Positive_BlockVolumeMapControllerAttachEnabled(t *testing.T) { kubeClient, true, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -631,7 +623,6 @@ func Test_Run_Positive_BlockVolumeAttachMapUnmapDetach(t *testing.T) { kubeClient, false, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -727,7 +718,6 @@ func Test_Run_Positive_VolumeUnmapControllerAttachEnabled(t *testing.T) { kubeClient, true, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -1007,7 +997,6 @@ func Test_Run_Positive_VolumeFSResizeControllerAttachEnabled(t *testing.T) { kubeClient, true, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, @@ -1185,7 +1174,6 @@ func Test_Run_Positive_VolumeMountControllerAttachEnabledRace(t *testing.T) { kubeClient, true, /* controllerAttachDetachEnabled */ reconcilerLoopSleepDuration, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, dsw, diff --git a/pkg/kubelet/volumemanager/volume_manager.go b/pkg/kubelet/volumemanager/volume_manager.go index 561733d592c..0b8ee371759 100644 --- a/pkg/kubelet/volumemanager/volume_manager.go +++ b/pkg/kubelet/volumemanager/volume_manager.go @@ -52,10 +52,6 @@ const ( // between successive executions reconcilerLoopSleepPeriod = 100 * time.Millisecond - // reconcilerSyncStatesSleepPeriod is the amount of time the reconciler reconstruct process - // waits between successive executions - reconcilerSyncStatesSleepPeriod = 3 * time.Minute - // desiredStateOfWorldPopulatorLoopSleepPeriod is the amount of time the // DesiredStateOfWorldPopulator loop waits between successive executions desiredStateOfWorldPopulatorLoopSleepPeriod = 100 * time.Millisecond @@ -187,7 +183,6 @@ func NewVolumeManager( kubeClient, controllerAttachDetachEnabled, reconcilerLoopSleepPeriod, - reconcilerSyncStatesSleepPeriod, waitForAttachTimeout, nodeName, vm.desiredStateOfWorld,