Reboot SwingSet on bulldozer upgrade #7684
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
|
suggsest: refs #6644 |
JimLarson
approved these changes
May 10, 2023
| @@ -794,7 +794,21 @@ func upgrade10Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgr | |||
| app.VstorageKeeper.MigrateNoDataPlaceholders(ctx) // upgrade-10 only | |||
| normalizeProvisionAccount(ctx, app.AccountKeeper) | |||
|
|
|||
| return app.mm.RunMigrations(ctx, app.configurator, fromVm) | |||
| mvm, err := app.mm.RunMigrations(ctx, app.configurator, fromVm) | |||
There was a problem hiding this comment.
Check if err is non-nil here, and if so return. We don't want to proceed with swingset initialization in this case.
golang/cosmos/app/app.go
Outdated
| if err2 != nil { | ||
| // NOTE: A failed BOOTSTRAP_BLOCK means that the SwingSet state is inconsistent. | ||
| // Panic here, in the hopes that a replay from scratch will fix the problem. | ||
| panic(err) |
There was a problem hiding this comment.
Should be err2, but if you return on error right after RunMigrations() above, you can just reuse err and this line will be correct.
michaelfig
force-pushed
the
mfig-bulldozer-reboot-swingset
branch
from
1704044 to
3bb75e3
Compare
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: #6644
Description
When upgrading to
agoric-upgrade-10, SwingSet will be reinitialized. This PR adds that initialization to the upgrade handler so that it completes during upgrade before any new blocks are produced.Security Considerations
Improves security:
Scaling Considerations
Avoids costly upgrade work impacting blocks beyond the upgrade block itself.
Documentation Considerations
Testing Considerations