diff options
| author | Alex <alex@adnab.me> | 2023-01-03 15:28:24 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-01-03 15:28:24 +0000 |
| commit | 73ed9c74039448c69ebe382e361acf3ecbfef70b (patch) | |
| tree | 7fb21a559e53557d5dea5efd2b7dafe9f9751367 /src/block | |
| parent | 582b0761790b7958a3ba10c4b549b466997d2dcd (diff) | |
| parent | 1d5bdc17a46648eb3494ff629d0d360d0217c1e2 (diff) | |
| download | garage-73ed9c74039448c69ebe382e361acf3ecbfef70b.tar.gz garage-73ed9c74039448c69ebe382e361acf3ecbfef70b.zip | |
Merge pull request 'Refactor how things are migrated' (#461) from format-migration into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/461
Diffstat (limited to 'src/block')
| -rw-r--r-- | src/block/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/block/repair.rs | 1 | ||||
| -rw-r--r-- | src/block/resync.rs | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml index cbd58d32..1e4eb64e 100644 --- a/src/block/Cargo.toml +++ b/src/block/Cargo.toml @@ -31,7 +31,6 @@ rand = "0.8" async-compression = { version = "0.3", features = ["tokio", "zstd"] } zstd = { version = "0.9", default-features = false } -rmp-serde = "0.15" serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } serde_bytes = "0.11" diff --git a/src/block/repair.rs b/src/block/repair.rs index f5515d4e..a6ded65a 100644 --- a/src/block/repair.rs +++ b/src/block/repair.rs @@ -178,6 +178,7 @@ struct ScrubWorkerPersisted { time_last_complete_scrub: u64, corruptions_detected: u64, } +impl garage_util::migrate::InitialFormat for ScrubWorkerPersisted {} enum ScrubWorkerState { Running(BlockStoreIterator), diff --git a/src/block/resync.rs b/src/block/resync.rs index 51bb9846..9c7b3b0e 100644 --- a/src/block/resync.rs +++ b/src/block/resync.rs @@ -63,6 +63,7 @@ struct ResyncPersistedConfig { n_workers: usize, tranquility: u32, } +impl garage_util::migrate::InitialFormat for ResyncPersistedConfig {} enum ResyncIterResult { BusyDidSomething, |