Fix miscellaneaus data races
Fixed the remaining data races in the libnetwork code. Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
parent
61993ec6c2
commit
bc70ed60cb
3 changed files with 16 additions and 1 deletions
|
@ -64,14 +64,23 @@ type network struct {
|
|||
}
|
||||
|
||||
func (n *network) Name() string {
|
||||
n.Lock()
|
||||
defer n.Unlock()
|
||||
|
||||
return n.name
|
||||
}
|
||||
|
||||
func (n *network) ID() string {
|
||||
n.Lock()
|
||||
defer n.Unlock()
|
||||
|
||||
return string(n.id)
|
||||
}
|
||||
|
||||
func (n *network) Type() string {
|
||||
n.Lock()
|
||||
defer n.Unlock()
|
||||
|
||||
if n.driver == nil {
|
||||
return ""
|
||||
}
|
||||
|
|
|
@ -52,7 +52,11 @@ func createBasePath() {
|
|||
}
|
||||
|
||||
func removeUnusedPaths() {
|
||||
for range time.Tick(gpmCleanupPeriod) {
|
||||
gpmLock.Lock()
|
||||
period := gpmCleanupPeriod
|
||||
gpmLock.Unlock()
|
||||
|
||||
for range time.Tick(period) {
|
||||
gpmLock.Lock()
|
||||
pathList := make([]string, 0, len(garbagePathMap))
|
||||
for path := range garbagePathMap {
|
||||
|
|
|
@ -33,7 +33,9 @@ func newKey(t *testing.T) (string, error) {
|
|||
}
|
||||
|
||||
// Set the rpmCleanupPeriod to be low to make the test run quicker
|
||||
gpmLock.Lock()
|
||||
gpmCleanupPeriod = 2 * time.Second
|
||||
gpmLock.Unlock()
|
||||
|
||||
return name, nil
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue