Merge pull request #2465 from fraenkel/lock_conn

crosbymichael · web-flow · commit 3289dc63e93f · 2018-07-25T10:24:08.000-04:00
Use connection lock when creating services
diff --git a/client.go b/client.go
@@ -457,6 +457,8 @@ func (c *Client) NamespaceService() namespaces.Store {
 	if c.namespaceStore != nil {
 		return c.namespaceStore
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return NewNamespaceStoreFromClient(namespacesapi.NewNamespacesClient(c.conn))
 }
 
@@ -465,6 +467,8 @@ func (c *Client) ContainerService() containers.Store {
 	if c.containerStore != nil {
 		return c.containerStore
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return NewRemoteContainerStore(containersapi.NewContainersClient(c.conn))
 }
 
@@ -473,6 +477,8 @@ func (c *Client) ContentStore() content.Store {
 	if c.contentStore != nil {
 		return c.contentStore
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return contentproxy.NewContentStore(contentapi.NewContentClient(c.conn))
 }
 
@@ -481,6 +487,8 @@ func (c *Client) SnapshotService(snapshotterName string) snapshots.Snapshotter {
 	if c.snapshotters != nil {
 		return c.snapshotters[snapshotterName]
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return snproxy.NewSnapshotter(snapshotsapi.NewSnapshotsClient(c.conn), snapshotterName)
 }
 
@@ -489,6 +497,8 @@ func (c *Client) TaskService() tasks.TasksClient {
 	if c.taskService != nil {
 		return c.taskService
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return tasks.NewTasksClient(c.conn)
 }
 
@@ -497,6 +507,8 @@ func (c *Client) ImageService() images.Store {
 	if c.imageStore != nil {
 		return c.imageStore
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return NewImageStoreFromClient(imagesapi.NewImagesClient(c.conn))
 }
 
@@ -505,11 +517,15 @@ func (c *Client) DiffService() DiffService {
 	if c.diffService != nil {
 		return c.diffService
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return NewDiffServiceFromClient(diffapi.NewDiffClient(c.conn))
 }
 
 // IntrospectionService returns the underlying Introspection Client
 func (c *Client) IntrospectionService() introspectionapi.IntrospectionClient {
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return introspectionapi.NewIntrospectionClient(c.conn)
 }
 
@@ -518,11 +534,15 @@ func (c *Client) LeasesService() leases.Manager {
 	if c.leasesService != nil {
 		return c.leasesService
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return leasesproxy.NewLeaseManager(leasesapi.NewLeasesClient(c.conn))
 }
 
 // HealthService returns the underlying GRPC HealthClient
 func (c *Client) HealthService() grpc_health_v1.HealthClient {
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return grpc_health_v1.NewHealthClient(c.conn)
 }
 
@@ -531,11 +551,15 @@ func (c *Client) EventService() EventService {
 	if c.eventService != nil {
 		return c.eventService
 	}
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return NewEventServiceFromClient(eventsapi.NewEventsClient(c.conn))
 }
 
 // VersionService returns the underlying VersionClient
 func (c *Client) VersionService() versionservice.VersionClient {
+	c.connMu.Lock()
+	defer c.connMu.Unlock()
 	return versionservice.NewVersionClient(c.conn)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -457,6 +457,8 @@ func (c *Client) NamespaceService() namespaces.Store {`
`457`	`457`	`if c.namespaceStore != nil {`
`458`	`458`	`return c.namespaceStore`
`459`	`459`	`}`
	`460`	`+ c.connMu.Lock()`
	`461`	`+ defer c.connMu.Unlock()`
`460`	`462`	`return NewNamespaceStoreFromClient(namespacesapi.NewNamespacesClient(c.conn))`
`461`	`463`	`}`
`462`	`464`
`@@ -465,6 +467,8 @@ func (c *Client) ContainerService() containers.Store {`
`465`	`467`	`if c.containerStore != nil {`
`466`	`468`	`return c.containerStore`
`467`	`469`	`}`
	`470`	`+ c.connMu.Lock()`
	`471`	`+ defer c.connMu.Unlock()`
`468`	`472`	`return NewRemoteContainerStore(containersapi.NewContainersClient(c.conn))`
`469`	`473`	`}`
`470`	`474`
`@@ -473,6 +477,8 @@ func (c *Client) ContentStore() content.Store {`
`473`	`477`	`if c.contentStore != nil {`
`474`	`478`	`return c.contentStore`
`475`	`479`	`}`
	`480`	`+ c.connMu.Lock()`
	`481`	`+ defer c.connMu.Unlock()`
`476`	`482`	`return contentproxy.NewContentStore(contentapi.NewContentClient(c.conn))`
`477`	`483`	`}`
`478`	`484`
`@@ -481,6 +487,8 @@ func (c *Client) SnapshotService(snapshotterName string) snapshots.Snapshotter {`
`481`	`487`	`if c.snapshotters != nil {`
`482`	`488`	`return c.snapshotters[snapshotterName]`
`483`	`489`	`}`
	`490`	`+ c.connMu.Lock()`
	`491`	`+ defer c.connMu.Unlock()`
`484`	`492`	`return snproxy.NewSnapshotter(snapshotsapi.NewSnapshotsClient(c.conn), snapshotterName)`
`485`	`493`	`}`
`486`	`494`
`@@ -489,6 +497,8 @@ func (c *Client) TaskService() tasks.TasksClient {`
`489`	`497`	`if c.taskService != nil {`
`490`	`498`	`return c.taskService`
`491`	`499`	`}`
	`500`	`+ c.connMu.Lock()`
	`501`	`+ defer c.connMu.Unlock()`
`492`	`502`	`return tasks.NewTasksClient(c.conn)`
`493`	`503`	`}`
`494`	`504`
`@@ -497,6 +507,8 @@ func (c *Client) ImageService() images.Store {`
`497`	`507`	`if c.imageStore != nil {`
`498`	`508`	`return c.imageStore`
`499`	`509`	`}`
	`510`	`+ c.connMu.Lock()`
	`511`	`+ defer c.connMu.Unlock()`
`500`	`512`	`return NewImageStoreFromClient(imagesapi.NewImagesClient(c.conn))`
`501`	`513`	`}`
`502`	`514`
`@@ -505,11 +517,15 @@ func (c *Client) DiffService() DiffService {`
`505`	`517`	`if c.diffService != nil {`
`506`	`518`	`return c.diffService`
`507`	`519`	`}`
	`520`	`+ c.connMu.Lock()`
	`521`	`+ defer c.connMu.Unlock()`
`508`	`522`	`return NewDiffServiceFromClient(diffapi.NewDiffClient(c.conn))`
`509`	`523`	`}`
`510`	`524`
`511`	`525`	`// IntrospectionService returns the underlying Introspection Client`
`512`	`526`	`func (c *Client) IntrospectionService() introspectionapi.IntrospectionClient {`
	`527`	`+ c.connMu.Lock()`
	`528`	`+ defer c.connMu.Unlock()`
`513`	`529`	`return introspectionapi.NewIntrospectionClient(c.conn)`
`514`	`530`	`}`
`515`	`531`
`@@ -518,11 +534,15 @@ func (c *Client) LeasesService() leases.Manager {`
`518`	`534`	`if c.leasesService != nil {`
`519`	`535`	`return c.leasesService`
`520`	`536`	`}`
	`537`	`+ c.connMu.Lock()`
	`538`	`+ defer c.connMu.Unlock()`
`521`	`539`	`return leasesproxy.NewLeaseManager(leasesapi.NewLeasesClient(c.conn))`
`522`	`540`	`}`
`523`	`541`
`524`	`542`	`// HealthService returns the underlying GRPC HealthClient`
`525`	`543`	`func (c *Client) HealthService() grpc_health_v1.HealthClient {`
	`544`	`+ c.connMu.Lock()`
	`545`	`+ defer c.connMu.Unlock()`
`526`	`546`	`return grpc_health_v1.NewHealthClient(c.conn)`
`527`	`547`	`}`
`528`	`548`
`@@ -531,11 +551,15 @@ func (c *Client) EventService() EventService {`
`531`	`551`	`if c.eventService != nil {`
`532`	`552`	`return c.eventService`
`533`	`553`	`}`
	`554`	`+ c.connMu.Lock()`
	`555`	`+ defer c.connMu.Unlock()`
`534`	`556`	`return NewEventServiceFromClient(eventsapi.NewEventsClient(c.conn))`
`535`	`557`	`}`
`536`	`558`
`537`	`559`	`// VersionService returns the underlying VersionClient`
`538`	`560`	`func (c *Client) VersionService() versionservice.VersionClient {`
	`561`	`+ c.connMu.Lock()`
	`562`	`+ defer c.connMu.Unlock()`
`539`	`563`	`return versionservice.NewVersionClient(c.conn)`
`540`	`564`	`}`
`541`	`565`