fix(cosmos): don't init controller before upgrade #8106
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
|
Tip for reviewers: hide whitespace difference |
michaelfig
approved these changes
Jul 28, 2023
There was a problem hiding this comment.
LGTM! This is simpler than what I had tried.
@JimLarson: @mhofman and I concluded that supporting non-restarting (dynamic?) software-upgrade plans isn't necessary at this time, and we can punt it until we actually need it. This PR's assertions will cause such code to fail rather than proceed confusedly.
gibson042
approved these changes
Jul 28, 2023
Comment on lines
+634
to
636
| // This will cause the swingset controller to init if it hadn't yet, passing | ||
| // any upgrade plan or bootstrap flag when starting at an upgrade height | ||
| swingset.ModuleName, |
Comment on lines
-622
to
+620
| case AG_COSMOS_INIT: { | ||
| case ActionType.AG_COSMOS_INIT: { |
mhofman
force-pushed
the
mhofman/fix-controller-init-upgrade
branch
from
b66b4b6 to
2e06f25
Compare
mhofman
added a commit
that referenced
this pull request
Aug 7, 2023
fix(cosmos): don't init controller before upgrade
mhofman
added a commit
that referenced
this pull request
Aug 7, 2023
fix(cosmos): don't init controller before upgrade
mhofman
added a commit
that referenced
this pull request
Aug 16, 2023
fix(cosmos): don't init controller before upgrade
mhofman
added a commit
that referenced
this pull request
Aug 16, 2023
fix(cosmos): don't init controller before upgrade
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.
refs: #8060
Description
While testing upgrade handlers and migrations for #8031, I encountered an issue where the swingset controller was initialized before the migration starts. #8060 refactored some of this logic, but didn't fix this issue.
This PR moves the init step to be triggered by the swingset module, and add guards making sure the upgrade handler is executed before init.
It also consolidates the bootstrap into the init message, which will allow the JS side to have stronger assertions about the expected swing-store state when initializing.
Security Considerations
None
Scaling Considerations
None
Documentation Considerations
None, internal logic. Add some comments about the different use cases supported
Testing Considerations
The existing docker upgrade test should cover the new assertion, and any cosmic-swingset test already covers the bootstrap logic. Further tests will be added in the migration PR addressing #8031
Upgrade Considerations
None, this simply enforces what were the expected upgrade start flow.