diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2018-07-12 13:36:01 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-07-12 13:36:57 -0700 |
| commit | 67507bd579a305e5d993c7cca71b665f33f341ff (patch) | |
| tree | 7dd1a20dcefb11cdb19afcff44afc4538ffa8ce9 /runsc/boot/loader.go | |
| parent | 41e0b977e5ffc667750c0f706bb70173c5de2161 (diff) | |
runsc: Don't close the control server in a defer.
Closing the control server will block until all open requests have completed.
If a control server method panics, we end up stuck because the defer'd Destroy
function will never return.
PiperOrigin-RevId: 204354676
Change-Id: I6bb1d84b31242d7c3f20d5334b1c966bd6a61dbf
Diffstat (limited to 'runsc/boot/loader.go')
| -rw-r--r-- | runsc/boot/loader.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index a3cc0e4a4..7de0a84cc 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -347,9 +347,12 @@ func newProcess(spec *specs.Spec, conf *Config, ioFDs []int, console bool, creds } // Destroy cleans up all resources used by the loader. +// +// Note that this will block until all open control server connections have +// been closed. For that reason, this should NOT be called in a defer, because +// a panic in a control server rpc would then hang forever. func (l *Loader) Destroy() { if l.ctrl != nil { - // Shut down control server. l.ctrl.srv.Stop() } l.stopSignalForwarding() |