github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

agent: clean up proxy process if start sandbox failed

Browse Source 
Otherwise we'll leave kata-proxy process dangling around forever.

Fixes: #759

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao 2018-09-19 15:36:06 +08:00
parent 35d3c0bf5a
commit 0ddf99d13c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtcontainers/kata_agent.go
View File

@ -569,6 +569,12 @@ func (k *kataAgent) startSandbox(sandbox *Sandbox) error {
return err return err
} }
defer func() {
if err != nil {
k.proxy.stop(k.state.ProxyPid)
}
}()
hostname := sandbox.config.Hostname hostname := sandbox.config.Hostname
if len(hostname) > maxHostnameLen { if len(hostname) > maxHostnameLen {
hostname = hostname[:maxHostnameLen] hostname = hostname[:maxHostnameLen]
@ -586,10 +592,10 @@ func (k *kataAgent) startSandbox(sandbox *Sandbox) error {
if err != nil { if err != nil {
return err return err
} }
if err := k.updateInterfaces(interfaces); err != nil { if err = k.updateInterfaces(interfaces); err != nil {
return err return err
} }
if _, err := k.updateRoutes(routes); err != nil { if _, err = k.updateRoutes(routes); err != nil {
return err return err
} }