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

image: Improve store locking

Browse source 
This showed up in a recent profile.

Search doesn't need to take a lock on the store, because digestset has
its own locking.

Some other methods can get by with a read lock instead of an exclusive
lock.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2017-06-20 18:31:29 -07:00
parent 5eca8382b0
commit 44e67adae5
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 { type store struct {
sync.Mutex sync.RWMutex
ls LayerGetReleaser ls LayerGetReleaser
images map[ID]*imageMeta images map[ID]*imageMeta
fs StoreBackend fs StoreBackend
@ -166,9 +166,6 @@ func (is *store) Create(config []byte) (ID, error) {
} }
func (is *store) Search(term string) (ID, error) { func (is *store) Search(term string) (ID, error) {
is.Lock()
defer is.Unlock()
dgst, err := is.digestSet.Lookup(term) dgst, err := is.digestSet.Lookup(term)
if err != nil { if err != nil {
if err == digestset.ErrDigestNotFound { if err == digestset.ErrDigestNotFound {
@ -251,8 +248,8 @@ func (is *store) GetParent(id ID) (ID, error) {
} }
func (is *store) Children(id ID) []ID { func (is *store) Children(id ID) []ID {
is.Lock() is.RLock()
defer is.Unlock() defer is.RUnlock()
return is.children(id) return is.children(id)
} }
@ -276,8 +273,8 @@ func (is *store) Map() map[ID]*Image {
} }
func (is *store) imagesMap(all bool) map[ID]*Image { func (is *store) imagesMap(all bool) map[ID]*Image {
is.Lock() is.RLock()
defer is.Unlock() defer is.RUnlock()
images := make(map[ID]*Image) images := make(map[ID]*Image)