mirror of
https://github.com/containers/podman.git
synced 2025-10-18 19:53:58 +08:00
Fix netavark error handling and teardown issue
The return error was not returned by podman , instead a different error was created. Also make sure to free assigned ips on an error to not leak them. Lastly podman container cleanup uses the default network backend instead of the provided one, we need to add `--network-backend` to the exit command. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@ -55,7 +55,15 @@ func (n *netavarkNetwork) Setup(namespacePath string, options types.SetupOptions
|
||||
|
||||
result := map[string]types.StatusBlock{}
|
||||
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) {
|
||||
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))
|
||||
|
@ -295,6 +295,7 @@ func CreateExitCommandArgs(storageConfig storageTypes.StoreOptions, config *conf
|
||||
"--cgroup-manager", config.Engine.CgroupManager,
|
||||
"--tmpdir", config.Engine.TmpDir,
|
||||
"--cni-config-dir", config.Network.NetworkConfigDir,
|
||||
"--network-backend", config.Network.NetworkBackend,
|
||||
}
|
||||
if config.Engine.OCIRuntime != "" {
|
||||
command = append(command, []string{"--runtime", config.Engine.OCIRuntime}...)
|
||||
|
Reference in New Issue
Block a user