opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12352 from Luap99/netavark-err

Browse Source 
Fix netavark error handling and teardown issue
This commit is contained in:
Daniel J Walsh
2021-11-22 16:01:40 -05:00
committed by GitHub
parent 0b7c132d9f 044edbb9c9
commit 3eb1453b80
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libpod/network/netavark/run.go
View File

@ -55,7 +55,15 @@ func (n *netavarkNetwork) Setup(namespacePath string, options types.SetupOptions
result := map[string]types.StatusBlock{} result := map[string]types.StatusBlock{}
err = n.execNetavark([]string{"setup", namespacePath}, netavarkOpts, &result) err = n.execNetavark([]string{"setup", namespacePath}, netavarkOpts, &result)
if err != nil {
// lets dealloc ips to prevent leaking
if err := n.deallocIPs(&options.NetworkOptions); err != nil {
logrus.Error(err)
}
return nil, err
}
// make sure that the result makes sense
if len(result) != len(options.Networks) { if len(result) != len(options.Networks) {
logrus.Errorf("unexpected netavark result: %v", result) logrus.Errorf("unexpected netavark result: %v", result)
return nil, fmt.Errorf("unexpected netavark result length, want (%d), got (%d) networks", len(options.Networks), len(result)) return nil, fmt.Errorf("unexpected netavark result length, want (%d), got (%d) networks", len(options.Networks), len(result))

1
pkg/specgenutil/util.go
View File

@ -295,6 +295,7 @@ func CreateExitCommandArgs(storageConfig storageTypes.StoreOptions, config *conf
"--cgroup-manager", config.Engine.CgroupManager, "--cgroup-manager", config.Engine.CgroupManager,
"--tmpdir", config.Engine.TmpDir, "--tmpdir", config.Engine.TmpDir,
"--cni-config-dir", config.Network.NetworkConfigDir, "--cni-config-dir", config.Network.NetworkConfigDir,
"--network-backend", config.Network.NetworkBackend,
} }
if config.Engine.OCIRuntime != "" { if config.Engine.OCIRuntime != "" {
command = append(command, []string{"--runtime", config.Engine.OCIRuntime}...) command = append(command, []string{"--runtime", config.Engine.OCIRuntime}...)