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

StatefulSetReaper#Stop: use the timeout we calculate

Browse Source 
Previous behavior was to use the Reaper's timeout field for both Scaler
timeouts.
This commit is contained in:
Alexander Campbell 2017-06-01 09:10:08 -07:00
parent 3a0d8f8fea
commit 080e45d775
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/stop.go
View File

@ -323,14 +323,16 @@ func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Durat
if err != nil { if err != nil {
return err return err
} }
if timeout == 0 { if timeout == 0 {
numReplicas := ss.Spec.Replicas numReplicas := ss.Spec.Replicas
// See discussion of this behavior here:
// BUG: this timeout is never used. // https://github.com/kubernetes/kubernetes/pull/46468#discussion_r118589512
timeout = Timeout + time.Duration(10*numReplicas)*time.Second timeout = Timeout + time.Duration(10*numReplicas)*time.Second
} }
retry := NewRetryParams(reaper.pollInterval, reaper.timeout) retry := NewRetryParams(reaper.pollInterval, reaper.timeout)
waitForStatefulSet := NewRetryParams(reaper.pollInterval, reaper.timeout) waitForStatefulSet := NewRetryParams(reaper.pollInterval, timeout)
if err = scaler.Scale(namespace, name, 0, nil, retry, waitForStatefulSet); err != nil { if err = scaler.Scale(namespace, name, 0, nil, retry, waitForStatefulSet); err != nil {
return err return err
} }