Merge pull request #4989 from hashicorp/dani/b-client-update-race-con…

…dition client: Give a copy of clientconfig to allocrunner
hashicorp · Dec 17, 2018 · bba8b4e · bba8b4e
2 parents a282cf6 + 30bed98
commit bba8b4e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/client/client.go b/client/client.go
@@ -867,7 +867,7 @@ func (c *Client) restoreState() error {
 		arConf := &allocrunner.Config{
 			Alloc:                 alloc,
 			Logger:                c.logger,
-			ClientConfig:          c.config,
+			ClientConfig:          c.configCopy,
 			StateDB:               c.stateDB,
 			StateUpdater:          c,
 			DeviceStatsReporter:   c,
@@ -2057,7 +2057,7 @@ func (c *Client) addAlloc(alloc *structs.Allocation, migrateToken string) error
 	arConf := &allocrunner.Config{
 		Alloc:                 alloc,
 		Logger:                c.logger,
-		ClientConfig:          c.config,
+		ClientConfig:          c.configCopy,
 		StateDB:               c.stateDB,
 		Consul:                c.consulService,
 		Vault:                 c.vaultClient,