opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move containers to file locks from c/storage

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
This commit is contained in:
Matthew Heon
2017-11-24 13:39:29 -05:00
parent 750fc239b5
commit abfd18b0db
6 changed files with 117 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libpod/runtime.go
View File

@ -25,6 +25,7 @@ type Runtime struct {
storageService *storageService
imageContext *types.SystemContext
ociRuntime *OCIRuntime
locksDir string
valid bool
lock sync.RWMutex
}
@ -136,6 +137,17 @@ func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) {
}
}
// Make a directory to hold container lockfiles
lockPath := filepath.Join(runtime.config.StaticDir, "lock")
if err := os.MkdirAll(lockPath, 0755); err != nil {
// The directory is allowed to exist
if !os.IsExist(err) {
return nil, errors.Wrapf(err, "error creating runtime lockfiles directory %s",
lockPath)
}
}
runtime.locksDir = lockPath
// Make the per-boot files directory if it does not exist
if err := os.MkdirAll(runtime.config.TmpDir, 0755); err != nil {
// The directory is allowed to exist
@ -166,7 +178,7 @@ func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) {
}
}
state, err := NewSQLState(dbPath, lockPath, specsDir, runtime)
state, err := NewSQLState(dbPath, lockPath, specsDir, runtime.locksDir, runtime)
if err != nil {
return nil, err
}