Add lz4 to snapshot filename regex for matching files on load (#25633)
* Add lz4 to snapshot filename regex for matching files on load * Add tests for lz4 archive format filenames
This commit is contained in:
parent
02b26ddd82
commit
56d38e4954
|
@ -58,8 +58,8 @@ pub const BANK_SNAPSHOT_PRE_FILENAME_EXTENSION: &str = "pre";
|
||||||
pub const MAX_BANK_SNAPSHOTS_TO_RETAIN: usize = 8; // Save some bank snapshots but not too many
|
pub const MAX_BANK_SNAPSHOTS_TO_RETAIN: usize = 8; // Save some bank snapshots but not too many
|
||||||
pub const DEFAULT_MAX_FULL_SNAPSHOT_ARCHIVES_TO_RETAIN: usize = 2;
|
pub const DEFAULT_MAX_FULL_SNAPSHOT_ARCHIVES_TO_RETAIN: usize = 2;
|
||||||
pub const DEFAULT_MAX_INCREMENTAL_SNAPSHOT_ARCHIVES_TO_RETAIN: usize = 4;
|
pub const DEFAULT_MAX_INCREMENTAL_SNAPSHOT_ARCHIVES_TO_RETAIN: usize = 4;
|
||||||
pub const FULL_SNAPSHOT_ARCHIVE_FILENAME_REGEX: &str = r"^snapshot-(?P<slot>[[:digit:]]+)-(?P<hash>[[:alnum:]]+)\.(?P<ext>tar|tar\.bz2|tar\.zst|tar\.gz)$";
|
pub const FULL_SNAPSHOT_ARCHIVE_FILENAME_REGEX: &str = r"^snapshot-(?P<slot>[[:digit:]]+)-(?P<hash>[[:alnum:]]+)\.(?P<ext>tar|tar\.bz2|tar\.zst|tar\.gz|tar\.lz4)$";
|
||||||
pub const INCREMENTAL_SNAPSHOT_ARCHIVE_FILENAME_REGEX: &str = r"^incremental-snapshot-(?P<base>[[:digit:]]+)-(?P<slot>[[:digit:]]+)-(?P<hash>[[:alnum:]]+)\.(?P<ext>tar|tar\.bz2|tar\.zst|tar\.gz)$";
|
pub const INCREMENTAL_SNAPSHOT_ARCHIVE_FILENAME_REGEX: &str = r"^incremental-snapshot-(?P<base>[[:digit:]]+)-(?P<slot>[[:digit:]]+)-(?P<hash>[[:alnum:]]+)\.(?P<ext>tar|tar\.bz2|tar\.zst|tar\.gz|tar\.lz4)$";
|
||||||
|
|
||||||
#[derive(Copy, Clone, Eq, PartialEq, Debug)]
|
#[derive(Copy, Clone, Eq, PartialEq, Debug)]
|
||||||
pub enum SnapshotVersion {
|
pub enum SnapshotVersion {
|
||||||
|
@ -2270,6 +2270,14 @@ mod tests {
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
(44, Hash::default(), ArchiveFormat::Tar)
|
(44, Hash::default(), ArchiveFormat::Tar)
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
parse_full_snapshot_archive_filename(&format!(
|
||||||
|
"snapshot-45-{}.tar.lz4",
|
||||||
|
Hash::default()
|
||||||
|
))
|
||||||
|
.unwrap(),
|
||||||
|
(45, Hash::default(), ArchiveFormat::TarLz4)
|
||||||
|
);
|
||||||
|
|
||||||
assert!(parse_full_snapshot_archive_filename("invalid").is_err());
|
assert!(parse_full_snapshot_archive_filename("invalid").is_err());
|
||||||
assert!(
|
assert!(
|
||||||
|
@ -2338,6 +2346,14 @@ mod tests {
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
(44, 345, Hash::default(), ArchiveFormat::Tar)
|
(44, 345, Hash::default(), ArchiveFormat::Tar)
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
parse_incremental_snapshot_archive_filename(&format!(
|
||||||
|
"incremental-snapshot-45-456-{}.tar.lz4",
|
||||||
|
Hash::default()
|
||||||
|
))
|
||||||
|
.unwrap(),
|
||||||
|
(45, 456, Hash::default(), ArchiveFormat::TarLz4)
|
||||||
|
);
|
||||||
|
|
||||||
assert!(parse_incremental_snapshot_archive_filename("invalid").is_err());
|
assert!(parse_incremental_snapshot_archive_filename("invalid").is_err());
|
||||||
assert!(parse_incremental_snapshot_archive_filename(&format!(
|
assert!(parse_incremental_snapshot_archive_filename(&format!(
|
||||||
|
|
Loading…
Reference in New Issue