mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #46784 from alexandercampbell/fix-reaper-timeout-bug
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:
commit
a2d7dc5b36
@ -323,14 +323,16 @@ func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Durat
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if timeout == 0 {
|
||||
numReplicas := ss.Spec.Replicas
|
||||
|
||||
// BUG: this timeout is never used.
|
||||
// See discussion of this behavior here:
|
||||
// https://github.com/kubernetes/kubernetes/pull/46468#discussion_r118589512
|
||||
timeout = Timeout + time.Duration(10*numReplicas)*time.Second
|
||||
}
|
||||
|
||||
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 {
|
||||
return err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user