github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 23:17:42 +00:00
Code Issues Projects Releases Wiki Activity

virtconainers: rollback the NetNs when createNetwork failed

Browse Source 
When createNetwork failed, cleanup the NetNs if it created.

Fixes: #508

Signed-off-by: fupan <lifupan@gmail.com>
This commit is contained in:
fupan 2018-07-24 09:49:42 +08:00
parent 14d25b82a4
commit c6fda444b7
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
virtcontainers/sandbox.go
View File

@ -906,8 +906,20 @@ func (s *Sandbox) Delete() error {
} }
func (s *Sandbox) createNetwork() error { func (s *Sandbox) createNetwork() error {
var netNsPath string
var netNsCreated bool
var networkNS NetworkNamespace
var err error
//rollback the NetNs when createNetwork failed
defer func() {
if err != nil && netNsPath != "" && netNsCreated {
deleteNetNS(netNsPath)
}
}()
// Initialize the network. // Initialize the network.
netNsPath, netNsCreated, err := s.network.init(s.config.NetworkConfig) netNsPath, netNsCreated, err = s.network.init(s.config.NetworkConfig)
if err != nil { if err != nil {
return err return err
} }
@ -920,14 +932,16 @@ func (s *Sandbox) createNetwork() error {
} }
// Add the network // Add the network
networkNS, err := s.network.add(s, s.config.NetworkConfig, netNsPath, netNsCreated) networkNS, err = s.network.add(s, s.config.NetworkConfig, netNsPath, netNsCreated)
if err != nil { if err != nil {
return err return err
} }
s.networkNS = networkNS s.networkNS = networkNS
// Store the network // Store the network
return s.storage.storeSandboxNetwork(s.id, networkNS) err = s.storage.storeSandboxNetwork(s.id, networkNS)
return err
} }
func (s *Sandbox) removeNetwork() error { func (s *Sandbox) removeNetwork() error {