kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

volume/store: fix couple of races with accessing maps

Browse source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2016-03-29 10:46:29 -07:00
parent d33480474f
commit e6d87c0706
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
volume/store/store.go
View file

@ -267,7 +267,9 @@ func (s *VolumeStore) create(name, driverName string, opts, labels map[string]st
if err != nil { if err != nil {
return nil, err return nil, err
} }
s.globalLock.Lock()
s.labels[name] = labels s.labels[name] = labels
s.globalLock.Unlock()
if s.db != nil { if s.db != nil {
metadata := &volumeMetadata{ metadata := &volumeMetadata{
@ -362,7 +364,10 @@ func (s *VolumeStore) getVolume(name string) (volume.Volume, error) {
} }
logrus.Debugf("Getting volume reference for name: %s", name) logrus.Debugf("Getting volume reference for name: %s", name)
if v, exists := s.names[name]; exists { s.globalLock.Lock()
v, exists := s.names[name]
s.globalLock.Unlock()
if exists {
vd, err := volumedrivers.GetDriver(v.DriverName()) vd, err := volumedrivers.GetDriver(v.DriverName())
if err != nil { if err != nil {
return nil, err return nil, err