Merge pull request #55128 from foxyriver/fix-timer

Automatic merge from submit-queue (batch tested with PRs 54602, 54877, 55243, 55509, 55128). 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>.

stop timer

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

stop the timer after using it
This commit is contained in:
Kubernetes Submit Queue 2017-11-14 03:03:34 -08:00 committed by GitHub
commit 8bdd6614f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

View File

@ -104,6 +104,7 @@ func (a *poller) bootstrapping() {
// bootstrapGracePeriod is read-only, so no lock is required
timer := time.NewTimer(a.bootstrapGracePeriod)
go func() {
defer timer.Stop()
<-timer.C
a.lock.Lock()
defer a.lock.Unlock()

View File

@ -50,6 +50,7 @@ func TestTolerateBootstrapFailure(t *testing.T) {
go func() {
// The test might have false negative, but won't be flaky
timer := time.NewTimer(2 * time.Second)
defer timer.Stop()
<-timer.C
fakeGetSucceedLock.Lock()
defer fakeGetSucceedLock.Unlock()