vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace sync.Mutex with sync.Locker to allow different locks

Browse source 
Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2017-07-14 15:56:37 -04:00
parent 96ebf829c9
commit 4086f2bc37
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/server.go
View file

@ -57,7 +57,7 @@ type Server struct {
store sstorage.Store store sstorage.Store
storageImageServer storage.ImageServer storageImageServer storage.ImageServer
storageRuntimeServer storage.RuntimeServer storageRuntimeServer storage.RuntimeServer
stateLock sync.Mutex stateLock sync.Locker
updateLock sync.RWMutex updateLock sync.RWMutex
state *serverState state *serverState
netPlugin ocicni.CNIPlugin netPlugin ocicni.CNIPlugin
@ -589,6 +589,7 @@ func New(config *Config) (*Server, error) {
store: store, store: store,
storageImageServer: imageService, storageImageServer: imageService,
storageRuntimeServer: storageRuntimeService, storageRuntimeServer: storageRuntimeService,
stateLock: new(sync.Mutex),
netPlugin: netPlugin, netPlugin: netPlugin,
hostportManager: hostportManager, hostportManager: hostportManager,
config: *config, config: *config,