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

Merge pull request #46784 from alexandercampbell/fix-reaper-timeout-bug

Browse Source 
Automatic merge from submit-queue

Fix Reaper timeout bug

This PR is an fix to the issue [noticed](https://github.com/kubernetes/kubernetes/pull/46468#discussion_r118589512) in a previous PR.

Previous behavior was to calculate a timeout but then ignore it, using `reaper.timeout` instead.
New behavior is to use the calculated timeout for `waitForStatefulSet`, which is passed to the Scaler.

Thanks to @foxish and @apelisse for pointing me in the right direction.

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-28 15:30:24 -07:00 committed by GitHub
commit a2d7dc5b36
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
} }