luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

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

client: Give a copy of clientconfig to allocrunner
This commit is contained in:
Danielle Tomlinson 2018-12-17 10:49:46 +01:00 committed by GitHub
parent 53aa1bc198 3823599da9
commit d9174d8dcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/client.go
View File

@ -867,7 +867,7 @@ func (c *Client) restoreState() error {
arConf := &allocrunner.Config{ arConf := &allocrunner.Config{
Alloc: alloc, Alloc: alloc,
Logger: c.logger, Logger: c.logger,
ClientConfig: c.config, ClientConfig: c.configCopy,
StateDB: c.stateDB, StateDB: c.stateDB,
StateUpdater: c, StateUpdater: c,
DeviceStatsReporter: c, DeviceStatsReporter: c,
@ -2057,7 +2057,7 @@ func (c *Client) addAlloc(alloc *structs.Allocation, migrateToken string) error
arConf := &allocrunner.Config{ arConf := &allocrunner.Config{
Alloc: alloc, Alloc: alloc,
Logger: c.logger, Logger: c.logger,
ClientConfig: c.config, ClientConfig: c.configCopy,
StateDB: c.stateDB, StateDB: c.stateDB,
Consul: c.consulService, Consul: c.consulService,
Vault: c.vaultClient, Vault: c.vaultClient,