Skip to content

K
k3s
Unverified Commit 8bdd6614 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents b2125f5a cdc4aca9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager.go
View file @ 8bdd6614
...@@ -104,6 +104,7 @@ func (a *poller) bootstrapping() { ...@@ -104,6 +104,7 @@ func (a *poller) bootstrapping() {
// bootstrapGracePeriod is read-only, so no lock is required // bootstrapGracePeriod is read-only, so no lock is required
timer := time.NewTimer(a.bootstrapGracePeriod) timer := time.NewTimer(a.bootstrapGracePeriod)
go func() { go func() {
defer timer.Stop()
<-timer.C <-timer.C
a.lock.Lock() a.lock.Lock()
defer a.lock.Unlock() defer a.lock.Unlock()
......
staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager_test.go
View file @ 8bdd6614
...@@ -50,6 +50,7 @@ func TestTolerateBootstrapFailure(t *testing.T) { ...@@ -50,6 +50,7 @@ func TestTolerateBootstrapFailure(t *testing.T) {
go func() { go func() {
// The test might have false negative, but won't be flaky // The test might have false negative, but won't be flaky
timer := time.NewTimer(2 * time.Second) timer := time.NewTimer(2 * time.Second)
defer timer.Stop()
<-timer.C <-timer.C
fakeGetSucceedLock.Lock() fakeGetSucceedLock.Lock()
defer fakeGetSucceedLock.Unlock() defer fakeGetSucceedLock.Unlock()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment