diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-01-20 22:56:13 +0100 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2021-01-21 11:50:45 +0100 |
| commit | 836fa4c493c3809da4bbcbbec0bf5ceb954e7410 (patch) | |
| tree | a07df59ab8a8ca5ef913c69c977662d0cbb441aa /libpod/network/create.go | |
| parent | c1cd512cb824c4c470efe7660c91ffeda62327bc (diff) | |
| download | podman-836fa4c493c3809da4bbcbbec0bf5ceb954e7410.tar.gz podman-836fa4c493c3809da4bbcbbec0bf5ceb954e7410.tar.bz2 podman-836fa4c493c3809da4bbcbbec0bf5ceb954e7410.zip | |
Move the cni lock file into the cni config dir
Commit(fe3faa517e1b) introduced a lock file for network create/rm calls.
There is a problem with the location of the lock file. The lock file was
stored in the tmpdir. Running multiple podman network create/remove
commands in parallel with different tmpdirs made the lockfile inaccessible
to the other process, and so parallel read/write operations to the cni
config directory continued to occur. This scenario happened frequently
during the e2e tests and caused some flakes.
Fixes #9041
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'libpod/network/create.go')
| -rw-r--r-- | libpod/network/create.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/network/create.go b/libpod/network/create.go index 094fbe349..e7f65358b 100644 --- a/libpod/network/create.go +++ b/libpod/network/create.go @@ -23,7 +23,7 @@ func Create(name string, options entities.NetworkCreateOptions, runtimeConfig *c return nil, err } // Acquire a lock for CNI - l, err := acquireCNILock(filepath.Join(runtimeConfig.Engine.TmpDir, LockFileName)) + l, err := acquireCNILock(runtimeConfig) if err != nil { return nil, err } |