state/remote/atlas: handle conflicts on equivalent states #3603
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phinze
force-pushed
the
b-atlas-state-conflict-handling
branch
2 times, most recently
from
4cb4c9f
to
5290fb3
Compare
| } | ||
|
|
||
| return fmt.Errorf( | ||
| "Atlas detected a state conflict.\n\nMessage: %s", c.readBody(resp.Body)) |
|
Left one comment, but this looks sound to me. Great tests too! |
Atlas returns an HTTP 409 - Conflict if the pushed state reports the same Serial number but the checksum of the raw content differs. This can sometimes happen when Terraform changes state representation internally between versions in a way that's semantically neutral but affects the JSON output and therefore the checksum. Here we detect and handle this situation by ticking the serial and retrying iff for the previous state and the proposed state: * the serials match * the parsed states are Equal (semantically equivalent) In other words, in this situation Terraform can override Atlas's detected conflict by asserting that the state it is pushing is indeed correct.
phinze
force-pushed
the
b-atlas-state-conflict-handling
branch
from
5290fb3
to
6aa5fdc
Compare
|
Addressed comments. 🚢 |
phinze
added a commit
that referenced
this pull request
Oct 22, 2015
state/remote/atlas: handle conflicts on equivalent states
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Atlas returns an HTTP 409 - Conflict if the pushed state reports the same
Serial number but the checksum of the raw content differs. This can
sometimes happen when Terraform changes state representation internally
between versions in a way that's semantically neutral but affects the JSON
output and therefore the checksum.
Here we detect and handle this situation by ticking the serial and retrying
iff for the previous state and the proposed state:
In other words, in this situation Terraform can override Atlas's detected
conflict by asserting that the state it is pushing is indeed correct.