mirror of
https://github.com/containers/podman.git
synced 2025-07-15 03:02:52 +08:00
1db70cce34
It's not necessary to fill in state immediately, as we'll be overwriting it on any API call accessing it thanks to syncContainer(). It is also causing races when we fetch it without holding the container lock (which syncContainer() does). As such, just don't retrieve the state on initial pull from the database with Bolt. Also, refactor some Linux-specific netns handling functions out of container_internal_linux.go into boltdb_linux.go. Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1186 Approved by: rhatdan
50 lines
1.3 KiB
Go
50 lines
1.3 KiB
Go
// +build linux
|
|
|
|
package libpod
|
|
|
|
import (
|
|
"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 {
|
|
logrus.Errorf("error joining network namespace for container %s", ctr.ID())
|
|
ctr.valid = false
|
|
}
|
|
}
|
|
} 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 ""
|
|
}
|