mirror of
https://github.com/containers/podman.git
synced 2025-05-21 00:56:36 +08:00

Podman adds an Error: to every error message. So starting an error message with "error" ends up being reported to the user as Error: error ... This patch removes the stutter. Also ioutil.ReadFile errors report the Path, so wrapping the err message with the path causes a stutter. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
58 lines
1.5 KiB
Go
58 lines
1.5 KiB
Go
//go:build linux
|
|
// +build linux
|
|
|
|
package libpod
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/containers/podman/v4/libpod/define"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// replaceNetNS handle network namespace transitions after updating a
|
|
// container's state.
|
|
func replaceNetNS(netNSPath string, ctr *Container, newState *ContainerState) error {
|
|
if netNSPath != "" {
|
|
// Check if the container's old state has a good netns
|
|
if ctr.state.NetNS != nil && netNSPath == ctr.state.NetNS.Path() {
|
|
newState.NetNS = ctr.state.NetNS
|
|
} else {
|
|
// Close the existing namespace.
|
|
// Whoever removed it from the database already tore it down.
|
|
if err := ctr.runtime.closeNetNS(ctr); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Open the new network namespace
|
|
ns, err := joinNetNS(netNSPath)
|
|
if err == nil {
|
|
newState.NetNS = ns
|
|
} else {
|
|
if ctr.ensureState(define.ContainerStateRunning, define.ContainerStatePaused) {
|
|
return fmt.Errorf("joining network namespace of container %s: %w", ctr.ID(), err)
|
|
}
|
|
|
|
logrus.Errorf("Joining network namespace for container %s: %v", ctr.ID(), err)
|
|
ctr.state.NetNS = nil
|
|
}
|
|
}
|
|
} else {
|
|
// The container no longer has a network namespace
|
|
// Close the old one, whoever removed it from the DB should have
|
|
// cleaned it up already.
|
|
if err := ctr.runtime.closeNetNS(ctr); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// getNetNSPath retrieves the netns path to be stored in the database
|
|
func getNetNSPath(ctr *Container) string {
|
|
if ctr.state.NetNS != nil {
|
|
return ctr.state.NetNS.Path()
|
|
}
|
|
return ""
|
|
}
|