Skip to content

Remove requirement that full snapshot intervals are a multiple of incremental #5519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstarry merged 1 commit into from
Mar 27, 2025
Merged

Remove requirement that full snapshot intervals are a multiple of incremental #5519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions core/src/validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2770,8 +2770,7 @@ pub fn is_snapshot_config_valid(snapshot_config: &SnapshotConfig) -> bool {
} else if incremental_snapshot_interval_slots == 0 {
false
} else {
full_snapshot_interval_slots % incremental_snapshot_interval_slots == 0
&& full_snapshot_interval_slots > incremental_snapshot_interval_slots
full_snapshot_interval_slots > incremental_snapshot_interval_slots
}
}

Expand Down Expand Up @@ -3157,7 +3156,7 @@ mod tests {
}
}

assert!(is_snapshot_config_valid(&new_snapshot_config(300, 100)));
assert!(is_snapshot_config_valid(&new_snapshot_config(300, 200)));

assert!(is_snapshot_config_valid(&new_snapshot_config(
snapshot_bank_utils::DEFAULT_FULL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS,
Expand All @@ -3176,20 +3175,24 @@ mod tests {
DISABLED_SNAPSHOT_ARCHIVE_INTERVAL
)));

// Full snaphot intervals used to be required to be a multiple of
// incremental snapshot intervals, but that's no longer the case
// so test that the check is relaxed.
assert!(is_snapshot_config_valid(&new_snapshot_config(100, 42)));
assert!(is_snapshot_config_valid(&new_snapshot_config(444, 200)));
assert!(is_snapshot_config_valid(&new_snapshot_config(400, 222)));

assert!(!is_snapshot_config_valid(&new_snapshot_config(0, 100)));
assert!(!is_snapshot_config_valid(&new_snapshot_config(100, 0)));
assert!(!is_snapshot_config_valid(&new_snapshot_config(0, 0)));
assert!(!is_snapshot_config_valid(&new_snapshot_config(42, 100)));
assert!(!is_snapshot_config_valid(&new_snapshot_config(100, 42)));
assert!(!is_snapshot_config_valid(&new_snapshot_config(100, 100)));
assert!(!is_snapshot_config_valid(&new_snapshot_config(100, 200)));
assert!(!is_snapshot_config_valid(&new_snapshot_config(444, 200)));
assert!(!is_snapshot_config_valid(&new_snapshot_config(400, 222)));

assert!(is_snapshot_config_valid(&SnapshotConfig::new_load_only()));
assert!(is_snapshot_config_valid(&SnapshotConfig {
full_snapshot_archive_interval_slots: 41,
incremental_snapshot_archive_interval_slots: 37,
full_snapshot_archive_interval_slots: 37,
incremental_snapshot_archive_interval_slots: 41,
..SnapshotConfig::new_load_only()
}));
assert!(is_snapshot_config_valid(&SnapshotConfig {
Expand Down
2 changes: 0 additions & 2 deletions validator/src/commands/run/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,8 +1010,6 @@ pub fn execute(
if !is_snapshot_config_valid(&validator_config.snapshot_config) {
Err(
"invalid snapshot configuration provided: snapshot intervals are incompatible. \
\n\t- full snapshot interval MUST be a multiple of incremental snapshot interval \
(if enabled) \
\n\t- full snapshot interval MUST be larger than incremental snapshot interval \
(if enabled)"
.to_string(),
Expand Down