Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stop: allow double-calling Stop() #34823

Merged
merged 1 commit into from
Feb 12, 2019
Merged

stop: allow double-calling Stop() #34823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pkg/util/stop/stopper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ type Stopper struct {
idAlloc int
qCancels map[int]func()
sCancels map[int]func()

stopCalled bool // turns all but first call to Stop into noop
}
}

Expand Down Expand Up @@ -448,6 +450,15 @@ func (s *Stopper) runningTasksLocked() TaskMap {
// Stop signals all live workers to stop and then waits for each to
// confirm it has stopped.
func (s *Stopper) Stop(ctx context.Context) {
s.mu.Lock()
stopCalled := s.mu.stopCalled
s.mu.stopCalled = true
s.mu.Unlock()

if stopCalled {
return
}

defer s.Recover(ctx)
defer unregister(s)

Expand Down
2 changes: 2 additions & 0 deletions pkg/util/stop/stopper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ func TestStopperIsStopped(t *testing.T) {
case <-time.After(time.Second):
t.Fatal("stopper should have finished stopping")
}

s.Stop(context.Background())
}

func TestStopperMultipleStopees(t *testing.T) {
Expand Down