Improves error text when snapshot intervals are incompatible #33551
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
steviez
approved these changes
Oct 5, 2023
| @@ -468,7 +468,8 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> { | |||
| .value_name("NUMBER") | |||
| .takes_value(true) | |||
| .default_value(&default_args.full_snapshot_archive_interval_slots) | |||
| .help("Number of slots between generating full snapshots") | |||
| .help("Number of slots between generating full snapshots. \ | |||
| Must be a multiple of the incremental snapshot interval.") | |||
There was a problem hiding this comment.
What do you think of:
Must be a multiple of --incremental-snapshot-interval-slots value
I mention this as I see --no-incremental-snapshots specifically mention args like this, but I'm fine with what you have as well. I don't think we have a hard rule on this
There was a problem hiding this comment.
The tricky thing is that we alias --snapshot-interval and --incremental-snapshot-interval. I didn't want to put 'em both here in the text for fear of being too long.
There was a problem hiding this comment.
Yeah true, I used the more explicit value but I see your point.
Codecov Report
@@ Coverage Diff @@
## master #33551 +/- ##
=======================================
Coverage 81.7% 81.7%
=======================================
Files 805 805
Lines 218111 218159 +48
=======================================
+ Hits 178379 178436 +57
+ Misses 39732 39723 -9 |
mergify bot
pushed a commit
that referenced
this pull request
Oct 6, 2023
(cherry picked from commit 35a0295)
brooksprumo
added a commit
that referenced
this pull request
Oct 6, 2023
…backport of #33551) (#33562) (cherry picked from commit 35a0295) Co-authored-by: Brooks <[email protected]>
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.
Problem
Starting in v1.17.0, we changed how the snapshot intervals were set. Specifically, the accounts hash interval is no longer manually set, and instead is coerced to the snapshot interval (see #31987). This effectively means that the full snapshot interval must be a multiple of the incremental snapshot interval.
That wasn't strictly required before, and a testnet validator ran into it here: https://discord.com/channels/428295358100013066/670512312339398668/1159565622074679407
The error text could be more clear about what is happening.
Summary of Changes
Remove mentions of the accounts hash interval, and use incremental snapshot interval instead.
new help text:
new error text:
Fixes: #33552