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

Merge pull request #33755 from aaronlehmann/imagestore-locking

Browse source 
image: Improve store locking
This commit is contained in:
Brian Goff 2017-06-21 10:01:19 -07:00 • committed by GitHub
commit e64c2d7122
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
image/store.go
View file

@ -37,7 +37,7 @@ type imageMeta struct {
}
type store struct {
sync.Mutex
sync.RWMutex
ls LayerGetReleaser
images map[ID]*imageMeta
fs StoreBackend
@ -166,9 +166,6 @@ func (is *store) Create(config []byte) (ID, error) {
}
func (is *store) Search(term string) (ID, error) {
is.Lock()
defer is.Unlock()
dgst, err := is.digestSet.Lookup(term)
if err != nil {
if err == digestset.ErrDigestNotFound {
@ -251,8 +248,8 @@ func (is *store) GetParent(id ID) (ID, error) {
}
func (is *store) Children(id ID) []ID {
is.Lock()
defer is.Unlock()
is.RLock()
defer is.RUnlock()
return is.children(id)
}
@ -276,8 +273,8 @@ func (is *store) Map() map[ID]*Image {
}
func (is *store) imagesMap(all bool) map[ID]*Image {
is.Lock()
defer is.Unlock()
is.RLock()
defer is.RUnlock()
images := make(map[ID]*Image)