github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61087 from lcfang/test0313

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove check "d >= 0" since go 1.8 is no longer supported on master branch

**What this PR does / why we need it**:

remove check "d >= 0" since go 1.8 is no longer supported on master branch

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-21 06:39:34 -07:00 committed by GitHub
commit 8c1e171eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go
View File

@ -128,9 +128,8 @@ func (r *rudimentaryErrorBackoff) OnError(error) {
r.lastErrorTimeLock.Lock() r.lastErrorTimeLock.Lock()
defer r.lastErrorTimeLock.Unlock() defer r.lastErrorTimeLock.Unlock()
d := time.Since(r.lastErrorTime) d := time.Since(r.lastErrorTime)
if d < r.minPeriod && d >= 0 { if d < r.minPeriod {
// If the time moves backwards for any reason, do nothing // If the time moves backwards for any reason, do nothing
// TODO: remove check "d >= 0" after go 1.8 is no longer supported
time.Sleep(r.minPeriod - d) time.Sleep(r.minPeriod - d)
} }
r.lastErrorTime = time.Now() r.lastErrorTime = time.Now()