diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2017-11-27 13:42:45 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2017-12-04 13:40:27 -0500 |
| commit | e9298a533adf30c3dd1990098665be23a0f29d1a (patch) | |
| tree | 12b3d265a1c7d5435f2953bf91ee6f56d4f54d44 /libpod/sql_state_internal.go | |
| parent | abfd18b0db8cb0ea331d90d702eab19e2157b973 (diff) | |
| download | podman-e9298a533adf30c3dd1990098665be23a0f29d1a.tar.gz podman-e9298a533adf30c3dd1990098665be23a0f29d1a.tar.bz2 podman-e9298a533adf30c3dd1990098665be23a0f29d1a.zip | |
Remove SQL state locking and rely on sqlite locking
Also renames some parameters from locksDir -> lockDir for
consistency.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'libpod/sql_state_internal.go')
| -rw-r--r-- | libpod/sql_state_internal.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/sql_state_internal.go b/libpod/sql_state_internal.go index e4af280ae..dfcd97c63 100644 --- a/libpod/sql_state_internal.go +++ b/libpod/sql_state_internal.go @@ -268,7 +268,7 @@ type scannable interface { } // Read a single container from a single row result in the database -func ctrFromScannable(row scannable, runtime *Runtime, specsDir string, locksDir string) (*Container, error) { +func ctrFromScannable(row scannable, runtime *Runtime, specsDir string, lockDir string) (*Container, error) { var ( id string name string @@ -387,7 +387,7 @@ func ctrFromScannable(row scannable, runtime *Runtime, specsDir string, locksDir ctr.runtime = runtime // Ensure the lockfile exists - lockPath := filepath.Join(locksDir, id) + lockPath := filepath.Join(lockDir, id) _, err = os.Stat(lockPath) if err != nil { return nil, errors.Wrapf(err, "error performing stat on container %s lockfile", id) |