Merge pull request kubernetes#26414 from jsafrane/reduce-sync-period

Automatic merge from submit-queue Reduce volume controller sync period fixes kubernetes#24236 and most probably also fixes kubernetes#25294. Needs kubernetes#25881! With the cache, binder is not affected by sync period. Without the cache, binding of 1000 PVCs takes more than 5 minutes (instead of ~70 seconds). 15 seconds were chosen by fair 2d10 roll :-)
ajwdev · May 30, 2016 · 9aeeef1 · 9aeeef1
2 parents e531a77 + 2aa9f1d
commit 9aeeef1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go
@@ -60,7 +60,7 @@ func NewCMServer() *CMServer {
 			NodeSyncPeriod:                    unversioned.Duration{Duration: 10 * time.Second},
 			ResourceQuotaSyncPeriod:           unversioned.Duration{Duration: 5 * time.Minute},
 			NamespaceSyncPeriod:               unversioned.Duration{Duration: 5 * time.Minute},
-			PVClaimBinderSyncPeriod:           unversioned.Duration{Duration: 10 * time.Minute},
+			PVClaimBinderSyncPeriod:           unversioned.Duration{Duration: 15 * time.Second},
 			HorizontalPodAutoscalerSyncPeriod: unversioned.Duration{Duration: 30 * time.Second},
 			DeploymentControllerSyncPeriod:    unversioned.Duration{Duration: 30 * time.Second},
 			MinResyncPeriod:                   unversioned.Duration{Duration: 12 * time.Hour},

diff --git a/docs/admin/kube-controller-manager.md b/docs/admin/kube-controller-manager.md
@@ -104,7 +104,7 @@ kube-controller-manager
       --pv-recycler-pod-template-filepath-hostpath="": The file path to a pod definition used as a template for HostPath persistent volume recycling. This is for development and testing only and will not work in a multi-node cluster.
       --pv-recycler-pod-template-filepath-nfs="": The file path to a pod definition used as a template for NFS persistent volume recycling
       --pv-recycler-timeout-increment-hostpath=30: the increment of time added per Gi to ActiveDeadlineSeconds for a HostPath scrubber pod.  This is for development and testing only and will not work in a multi-node cluster.
-      --pvclaimbinder-sync-period=10m0s: The period for syncing persistent volumes and persistent volume claims
+      --pvclaimbinder-sync-period=15s: The period for syncing persistent volumes and persistent volume claims
       --replicaset-lookup-cache-size=4096: The the size of lookup cache for replicatsets. Larger number = more responsive replica management, but more MEM load.
       --replication-controller-lookup-cache-size=4096: The the size of lookup cache for replication controllers. Larger number = more responsive replica management, but more MEM load.
       --resource-quota-sync-period=5m0s: The period for syncing quota usage status in the system
@@ -115,7 +115,7 @@ kube-controller-manager
       --terminated-pod-gc-threshold=12500: Number of terminated pods that can exist before the terminated pod garbage collector starts deleting terminated pods. If <= 0, the terminated pod garbage collector is disabled.
 ```
 
-###### Auto generated by spf13/cobra on 26-May-2016
+###### Auto generated by spf13/cobra on 27-May-2016
 
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

diff --git a/pkg/controller/persistentvolume/options/options.go b/pkg/controller/persistentvolume/options/options.go
@@ -44,7 +44,7 @@ type PersistentVolumeControllerOptions struct {
 
 func NewPersistentVolumeControllerOptions() PersistentVolumeControllerOptions {
 	return PersistentVolumeControllerOptions{
-		PVClaimBinderSyncPeriod: 10 * time.Minute,
+		PVClaimBinderSyncPeriod: 15 * time.Second,
 		VolumeConfigFlags: VolumeConfigFlags{
 			// default values here
 			PersistentVolumeRecyclerMaximumRetry:             3,