aboutsummaryrefslogtreecommitdiff
path: root/src/garage/cli
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2024-03-19 15:59:19 +0000
committerAlex <alex@adnab.me>2024-03-19 15:59:19 +0000
commit65853a48634d662809eee5dafbe48535d400f4a0 (patch)
tree3bb01998fa81651a54ade8bf17ba87b5a3eff970 /src/garage/cli
parent0038ca8a78f147b9c0ec07ef0121773aaf110dc9 (diff)
parent3eab639c146f67fc67534633ae26c9aec116327d (diff)
downloadgarage-65853a48634d662809eee5dafbe48535d400f4a0.tar.gz
garage-65853a48634d662809eee5dafbe48535d400f4a0.zip
Merge pull request 'block refcount repair' (#782) from block-ref-repair into next-0.10
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/782
Diffstat (limited to 'src/garage/cli')
-rw-r--r--src/garage/cli/structs.rs5
-rw-r--r--src/garage/cli/util.rs2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs
index 1f572a9a..8380b5e2 100644
--- a/src/garage/cli/structs.rs
+++ b/src/garage/cli/structs.rs
@@ -473,8 +473,11 @@ pub enum RepairWhat {
#[structopt(name = "mpu", version = garage_version())]
MultipartUploads,
/// Repropagate version deletions to the block ref table
- #[structopt(name = "block_refs", version = garage_version())]
+ #[structopt(name = "block-refs", version = garage_version())]
BlockRefs,
+ /// Recalculate block reference counters
+ #[structopt(name = "block-rc", version = garage_version())]
+ BlockRc,
/// Verify integrity of all blocks on disc
#[structopt(name = "scrub", version = garage_version())]
Scrub {
diff --git a/src/garage/cli/util.rs b/src/garage/cli/util.rs
index 0511e2b1..21c14f42 100644
--- a/src/garage/cli/util.rs
+++ b/src/garage/cli/util.rs
@@ -451,7 +451,7 @@ pub fn print_block_info(
if refcount != nondeleted_count {
println!();
println!(
- "Warning: refcount does not match number of non-deleted versions (see issue #644)."
+ "Warning: refcount does not match number of non-deleted versions, you should try `garage repair block-rc`."
);
}
}