ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terraform: write lock on post state updates 

Found race here: https://travis-ci.org/hashicorp/terraform/builds/177814212

Since WriteState calls `prune` and `init`, we're actually modifying the
state structure so we need a full write lock to perform this operation.
This commit is contained in:
Mitchell Hashimoto 2016-11-21 15:21:27 -08:00
parent e0d5d991d9
commit b6687aa287
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
terraform/eval_state.go
View File

@ -107,9 +107,10 @@ type EvalUpdateStateHook struct{}
func (n *EvalUpdateStateHook) Eval(ctx EvalContext) (interface{}, error) { func (n *EvalUpdateStateHook) Eval(ctx EvalContext) (interface{}, error) {
state, lock := ctx.State() state, lock := ctx.State()
// Get a read lock so it doesn't change while we're calling this // Get a full lock. Even calling something like WriteState can modify
lock.RLock() // (prune) the state, so we need the full lock.
defer lock.RUnlock() lock.Lock()
defer lock.Unlock()
// Call the hook // Call the hook
err := ctx.Hook(func(h Hook) (HookAction, error) { err := ctx.Hook(func(h Hook) (HookAction, error) {