emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cache_dump (rust)] Make use of the --repair option

Browse Source 
Ignore non-fatal errors, and regenerate unavailable dirty bits if --repair was applied.
This commit is contained in:
Ming-Hung Tsai
2021-09-15 21:26:18 +08:00
parent 3d36456a36
commit 8a1399e3bb
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cache/dump.rs vendored
View File

@@ -222,7 +222,7 @@ pub fn dump_metadata(
engine: Arc<dyn IoEngine + Send + Sync>, engine: Arc<dyn IoEngine + Send + Sync>,
out: &mut dyn MetadataVisitor, out: &mut dyn MetadataVisitor,
sb: &Superblock, sb: &Superblock,
_repair: bool, repair: bool,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let xml_sb = ir::Superblock { let xml_sb = ir::Superblock {
uuid: "".to_string(), uuid: "".to_string(),
@@ -236,7 +236,7 @@ pub fn dump_metadata(
out.mappings_b()?; out.mappings_b()?;
let valid_mappings = match sb.version { let valid_mappings = match sb.version {
1 => { 1 => {
let w = ArrayWalker::new(engine.clone(), false); let w = ArrayWalker::new(engine.clone(), repair);
let mut emitter = format1::MappingEmitter::new(sb.cache_blocks as usize, out); let mut emitter = format1::MappingEmitter::new(sb.cache_blocks as usize, out);
w.walk(&mut emitter, sb.mapping_root)?; w.walk(&mut emitter, sb.mapping_root)?;
emitter.get_valid() emitter.get_valid()
@@ -246,9 +246,8 @@ pub fn dump_metadata(
let dirty_bits; let dirty_bits;
if let Some(root) = sb.dirty_root { if let Some(root) = sb.dirty_root {
let (bits, errs) = let (bits, errs) =
read_bitset(engine.clone(), root, sb.cache_blocks as usize, false); read_bitset(engine.clone(), root, sb.cache_blocks as usize, repair);
// TODO: allow errors in repair mode if errs.is_some() && !repair {
if errs.is_some() {
return Err(anyhow!("errors in bitset {}", errs.unwrap())); return Err(anyhow!("errors in bitset {}", errs.unwrap()));
} }
dirty_bits = bits; dirty_bits = bits;
@@ -258,7 +257,7 @@ pub fn dump_metadata(
return Err(anyhow!("format 2 selected, but no dirty bitset present")); return Err(anyhow!("format 2 selected, but no dirty bitset present"));
} }
let w = ArrayWalker::new(engine.clone(), false); let w = ArrayWalker::new(engine.clone(), repair);
let mut emitter = let mut emitter =
format2::MappingEmitter::new(sb.cache_blocks as usize, dirty_bits, out); format2::MappingEmitter::new(sb.cache_blocks as usize, dirty_bits, out);
w.walk(&mut emitter, sb.mapping_root)?; w.walk(&mut emitter, sb.mapping_root)?;
@@ -272,7 +271,7 @@ pub fn dump_metadata(
out.hints_b()?; out.hints_b()?;
{ {
let w = ArrayWalker::new(engine.clone(), false); let w = ArrayWalker::new(engine.clone(), repair);
let mut emitter = HintEmitter::new(out, valid_mappings); let mut emitter = HintEmitter::new(out, valid_mappings);
w.walk(&mut emitter, sb.hint_root)?; w.walk(&mut emitter, sb.hint_root)?;
} }
@@ -296,7 +295,7 @@ pub fn dump(opts: CacheDumpOptions) -> anyhow::Result<()> {
} }
let mut out = xml::XmlWriter::new(writer); let mut out = xml::XmlWriter::new(writer);
dump_metadata(ctx.engine.clone(), &mut out, &sb, opts.repair) dump_metadata(ctx.engine, &mut out, &sb, opts.repair)
} }
//------------------------------------------ //------------------------------------------