7500c8cc72
it fixes race with access to containerMutexes
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit a7851e2556)
46 lines
1.1 KiB
Go
46 lines
1.1 KiB
Go
package libcontainerd
|
|
|
|
import (
|
|
"fmt"
|
|
"sync"
|
|
|
|
"github.com/docker/docker/pkg/locker"
|
|
)
|
|
|
|
// clientCommon contains the platform agnostic fields used in the client structure
|
|
type clientCommon struct {
|
|
backend Backend
|
|
containers map[string]*container
|
|
locker *locker.Locker
|
|
mapMutex sync.RWMutex // protects read/write oprations from containers map
|
|
}
|
|
|
|
func (clnt *client) lock(containerID string) {
|
|
clnt.locker.Lock(containerID)
|
|
}
|
|
|
|
func (clnt *client) unlock(containerID string) {
|
|
clnt.locker.Unlock(containerID)
|
|
}
|
|
|
|
// must hold a lock for cont.containerID
|
|
func (clnt *client) appendContainer(cont *container) {
|
|
clnt.mapMutex.Lock()
|
|
clnt.containers[cont.containerID] = cont
|
|
clnt.mapMutex.Unlock()
|
|
}
|
|
func (clnt *client) deleteContainer(friendlyName string) {
|
|
clnt.mapMutex.Lock()
|
|
delete(clnt.containers, friendlyName)
|
|
clnt.mapMutex.Unlock()
|
|
}
|
|
|
|
func (clnt *client) getContainer(containerID string) (*container, error) {
|
|
clnt.mapMutex.RLock()
|
|
container, ok := clnt.containers[containerID]
|
|
defer clnt.mapMutex.RUnlock()
|
|
if !ok {
|
|
return nil, fmt.Errorf("invalid container: %s", containerID) // fixme: typed error
|
|
}
|
|
return container, nil
|
|
}
|