diff options
author | Matthew Heon <matthew.heon@gmail.com> | 2018-07-30 09:42:35 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-31 14:19:50 +0000 |
commit | 1db70cce344724e091635bc8c6fa6c207450df68 (patch) | |
tree | ed48df83141568bb949a8bdd5611cd20b3fa42c2 /libpod/boltdb_state_unsupported.go | |
parent | cfcd92847684fc65949350b7cdc4769ad1099d46 (diff) | |
download | podman-1db70cce344724e091635bc8c6fa6c207450df68.tar.gz podman-1db70cce344724e091635bc8c6fa6c207450df68.tar.bz2 podman-1db70cce344724e091635bc8c6fa6c207450df68.zip |
Do not fetch pod and ctr State on retrieval in Bolt
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
Diffstat (limited to 'libpod/boltdb_state_unsupported.go')
-rw-r--r-- | libpod/boltdb_state_unsupported.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libpod/boltdb_state_unsupported.go b/libpod/boltdb_state_unsupported.go index 960faa911..4565c1890 100644 --- a/libpod/boltdb_state_unsupported.go +++ b/libpod/boltdb_state_unsupported.go @@ -6,12 +6,12 @@ import ( "github.com/sirupsen/logrus" ) -// parseNetNSBoltData sets ctr.state.NetNS, if any, from netNSBytes. -// Returns true if the data is valid. -func parseNetNSBoltData(ctr *Container, netNSBytes []byte) bool { - if netNSBytes != nil { - logrus.Errorf("error loading %s: network namespaces are not supported on this platform", ctr.ID()) - return false - } - return true +// replaceNetNS is exclusive to the Linux platform and is a no-op elsewhere +func replaceNetNS(netNSPath string, ctr *Container, newState *containerState) error { + return nil +} + +// getNetNSPath is exclusive to the Linux platform and is a no-op elsewhere +func getNetNSPath(ctr *Container) string { + return } |