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/garage/repair | |
| 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/garage/repair')
| -rw-r--r-- | src/garage/repair/online.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/garage/repair/online.rs b/src/garage/repair/online.rs index 7120972c..627e3bf3 100644 --- a/src/garage/repair/online.rs +++ b/src/garage/repair/online.rs @@ -12,6 +12,7 @@ use garage_model::s3::version_table::*; use garage_table::*; use garage_util::background::*; use garage_util::error::Error; +use garage_util::migrate::Migrate; use crate::*; @@ -100,7 +101,7 @@ impl Worker for RepairVersionsWorker { } }; - let version = rmp_serde::decode::from_read_ref::<_, Version>(&item_bytes)?; + let version = Version::decode(&item_bytes).ok_or_message("Cannot decode Version")?; if !version.deleted.get() { let object = self .garage @@ -180,7 +181,7 @@ impl Worker for RepairBlockrefsWorker { } }; - let block_ref = rmp_serde::decode::from_read_ref::<_, BlockRef>(&item_bytes)?; + let block_ref = BlockRef::decode(&item_bytes).ok_or_message("Cannot decode BlockRef")?; if !block_ref.deleted.get() { let version = self .garage |