core: Fix plan write/state write ordering bug
This commit is contained in:
parent
fb61a3d086
commit
e21d5d36f4
|
@ -206,6 +206,22 @@ func (n *NodePlannableResourceInstance) managedResourceExecute(ctx EvalContext)
|
||||||
return diags
|
return diags
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FIXME: it is currently important that we write resource changes to
|
||||||
|
// the plan (n.writeChange) before we write the corresponding state
|
||||||
|
// (n.writeResourceInstanceState).
|
||||||
|
//
|
||||||
|
// This is because the planned resource state will normally have the
|
||||||
|
// status of states.ObjectPlanned, which causes later logic to refer to
|
||||||
|
// the contents of the plan to retrieve the resource data. Because
|
||||||
|
// there is no shared lock between these two data structures, reversing
|
||||||
|
// the order of these writes will cause a brief window of inconsistency
|
||||||
|
// which can lead to a failed safety check.
|
||||||
|
//
|
||||||
|
// Future work should adjust these APIs such that it is impossible to
|
||||||
|
// update these two data structures incorrectly through any objects
|
||||||
|
// reachable via the terraform.EvalContext API.
|
||||||
|
diags = diags.Append(n.writeChange(ctx, change, ""))
|
||||||
|
|
||||||
diags = diags.Append(n.writeResourceInstanceState(ctx, instancePlanState, workingState))
|
diags = diags.Append(n.writeResourceInstanceState(ctx, instancePlanState, workingState))
|
||||||
if diags.HasErrors() {
|
if diags.HasErrors() {
|
||||||
return diags
|
return diags
|
||||||
|
@ -224,8 +240,6 @@ func (n *NodePlannableResourceInstance) managedResourceExecute(ctx EvalContext)
|
||||||
return diags
|
return diags
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
diags = diags.Append(n.writeChange(ctx, change, ""))
|
|
||||||
} else {
|
} else {
|
||||||
// Even if we don't plan changes, we do still need to at least update
|
// Even if we don't plan changes, we do still need to at least update
|
||||||
// the working state to reflect the refresh result. If not, then e.g.
|
// the working state to reflect the refresh result. If not, then e.g.
|
||||||
|
|
Loading…
Reference in New Issue