opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 14:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update containers/storage to fix locking bug

Browse Source 
Update to commit hash 1e5ce40cdb84ab66e26186435b1273e04b879fef

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #451
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-03-05 17:09:03 -05:00
committed by Atomic Bot
parent 649e4f07a3
commit ff9da1fb3f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -3,7 +3,7 @@ github.com/sirupsen/logrus v1.0.0
github.com/containers/image f7ea1dcb32a06092905672e99faa75bf2f61632b github.com/containers/image f7ea1dcb32a06092905672e99faa75bf2f61632b
github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1 github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1
github.com/ostreedev/ostree-go master github.com/ostreedev/ostree-go master
github.com/containers/storage 477e551dd493e5c80999d3690d3a201fd26ba2f1 github.com/containers/storage 1e5ce40cdb84ab66e26186435b1273e04b879fef
github.com/containernetworking/cni v0.4.0 github.com/containernetworking/cni v0.4.0
google.golang.org/grpc v1.0.4 https://github.com/grpc/grpc-go google.golang.org/grpc v1.0.4 https://github.com/grpc/grpc-go
github.com/opencontainers/selinux b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd github.com/opencontainers/selinux b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd

11
vendor/github.com/containers/storage/store.go generated vendored
View File

@ -462,6 +462,12 @@ type store struct {
// GetStore attempts to find an already-created Store object matching the // GetStore attempts to find an already-created Store object matching the
// specified location and graph driver, and if it can't, it creates and // specified location and graph driver, and if it can't, it creates and
// initializes a new Store object, and the underlying storage that it controls. // initializes a new Store object, and the underlying storage that it controls.
//
// If StoreOptions `options` haven't been fully populated, then DefaultStoreOptions are used.
//
// These defaults observe environment variables:
// * `STORAGE_DRIVER` for the name of the storage driver to attempt to use
// * `STORAGE_OPTS` for the string of options to pass to the driver
func GetStore(options StoreOptions) (Store, error) { func GetStore(options StoreOptions) (Store, error) {
if options.RunRoot == "" && options.GraphRoot == "" && options.GraphDriverName == "" && len(options.GraphDriverOptions) == 0 { if options.RunRoot == "" && options.GraphRoot == "" && options.GraphDriverName == "" && len(options.GraphDriverOptions) == 0 {
options = DefaultStoreOptions options = DefaultStoreOptions
@ -2270,14 +2276,15 @@ func (s *store) Shutdown(force bool) ([]string, error) {
return mounted, err return mounted, err
} }
s.graphLock.Lock()
defer s.graphLock.Unlock()
rlstore.Lock() rlstore.Lock()
defer rlstore.Unlock() defer rlstore.Unlock()
if modified, err := rlstore.Modified(); modified || err != nil { if modified, err := rlstore.Modified(); modified || err != nil {
rlstore.Load() rlstore.Load()
} }
s.graphLock.Lock()
defer s.graphLock.Unlock()
layers, err := rlstore.Layers() layers, err := rlstore.Layers()
if err != nil { if err != nil {
return mounted, err return mounted, err