github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

prevent Server reuse after a Shutdown

Browse Source 
Signed-off-by: zounengren <zouyee1989@gmail.com>
This commit is contained in:
zounengren
2022-07-24 15:55:16 +08:00
parent db3ecb286b
commit 20e7b399f9
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/cri/server/service.go
View File

@@ -268,24 +268,10 @@ func (c *criService) Run() error {
eventMonitorErr = err eventMonitorErr = err
} }
logrus.Info("Event monitor stopped") logrus.Info("Event monitor stopped")
// There is a race condition with http.Server.Serve. if err := <-streamServerErrCh; err != nil {
// When `Close` is called at the same time with `Serve`, `Close`
// may finish first, and `Serve` may still block.
// See https://github.com/golang/go/issues/20239.
// Here we set a 2 second timeout for the stream server wait,
// if it timeout, an error log is generated.
// TODO(random-liu): Get rid of this after https://github.com/golang/go/issues/20239
// is fixed.
const streamServerStopTimeout = 2 * time.Second
select {
case err := <-streamServerErrCh:
if err != nil {
streamServerErr = err streamServerErr = err
} }
logrus.Info("Stream server stopped") logrus.Info("Stream server stopped")
case <-time.After(streamServerStopTimeout):
logrus.Errorf("Stream server is not stopped in %q", streamServerStopTimeout)
}
if eventMonitorErr != nil { if eventMonitorErr != nil {
return fmt.Errorf("event monitor error: %w", eventMonitorErr) return fmt.Errorf("event monitor error: %w", eventMonitorErr)
} }