Work around a potentially bad assert in the engine #1644
Merged
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
The engine asserts if presented with a plan that deletes the same URN more than once. This has been empirically proven to be possible, so I am removing the assert.
ellismg
reviewed
Jul 18, 2018
| // | ||
| // Regardless, it is better to admit strange behavior in corner cases than it is to crash the CLI | ||
| // whenever we see multiple deletes for the same URN. | ||
| // contract.Assert(!sg.deletes[res.URN]) |
There was a problem hiding this comment.
Would it be worthwhile to glog (maybe at V(7) like the above) in this case?
lukehoban
reviewed
Jul 18, 2018
| ) | ||
|
|
||
| // Test that the engine tolerates two deletions of the same URN in the same plan. | ||
| func TestDoublePendingDelete(t *testing.T) { |
There was a problem hiding this comment.
Thanks for the new tests here!
|
Thanks for the reviews - I'm going to go ahead and merge this if there aren't any objections. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The engine asserts if presented with a plan that deletes the same URN
more than once. This has been empirically proven to be possible, so I am
removing the assert.
This fixes the immediate badness of #1503, but I'm going to leave the issue open until we understand all of the implications of deleting the same URN multiple times. I am certain that there are bugs lurking here and we may have to re-think how we do pending deletes in order to iron them all out.
This PR makes the CLI not crash when it sees a plan that deletes the same URN multiple times, which I think is a big enough improvement to justify the risk. It is really, really annoying to fix a stack that has wandered into this state as it is today.