Skip to content

Commit

Permalink
Merge #97555
Browse files Browse the repository at this point in the history
97555: server: use workersCtx in cmux error handler r=knz a=stevendanna

Since the error handler outlives the startup, it should be using the workersCtx.

I suspect this is the cause of #97032 but I haven't been able to reproduce that locally in a unit test.

Fixes #93032

Epic: none

Release note: none

Co-authored-by: Steven Danna <[email protected]>
  • Loading branch information
craig[bot] and stevendanna committed Feb 23, 2023
2 parents 2efb369 + 24238a9 commit 21e1f0a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/server/start_listen.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func startListenRPCAndSQL(
m.HandleError(func(err error) bool {
select {
case <-stopper.ShouldQuiesce():
log.Infof(ctx, "server shutting down: instructing cmux to stop accepting")
log.Infof(workersCtx, "server shutting down: instructing cmux to stop accepting")
return false
default:
return true
Expand Down

0 comments on commit 21e1f0a

Please sign in to comment.