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

[thin_shrink] Tidy up some messages

Browse Source
This commit is contained in:
Joe Thornber 2020-06-26 08:47:40 +01:00
parent d8a0805753
commit abf06236b1
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/shrink/toplevel.rs
View File

@ -435,45 +435,27 @@ fn process_xml<MV: xml::MetadataVisitor>(input_path: &str, pass: &mut MV) -> Res
pub fn shrink(input_path: &str, output_path: &str, data_path: &str, nr_blocks: u64) -> Result<()> { pub fn shrink(input_path: &str, output_path: &str, data_path: &str, nr_blocks: u64) -> Result<()> {
let mut pass1 = Pass1::new(nr_blocks); let mut pass1 = Pass1::new(nr_blocks);
eprint!("Reading xml...");
process_xml(input_path, &mut pass1)?; process_xml(input_path, &mut pass1)?;
eprintln!("done");
eprintln!("{} blocks need moving", pass1.nr_high_blocks); eprintln!("{} blocks need moving", pass1.nr_high_blocks);
let mut free_blocks = 0u64;
for i in 0..pass1.allocated_blocks.len() {
if !pass1.allocated_blocks[i] {
free_blocks += 1;
}
}
eprintln!("{} free blocks below new end.", free_blocks);
let ranges = bits_to_ranges(&pass1.allocated_blocks); let ranges = bits_to_ranges(&pass1.allocated_blocks);
eprintln!("{} allocated ranges:", ranges.len());
eprintln!("{:?}", &ranges);
let (below, above) = ranges_split(&ranges, nr_blocks); let (below, above) = ranges_split(&ranges, nr_blocks);
eprintln!("ranges split at {}: ({:?}, {:?})", nr_blocks, below, above);
let free = negate_ranges(&below); let free = negate_ranges(&below);
eprintln!("free {:?}.", free);
let nr_moving = ranges_total(&above);
eprintln!("{} blocks need to be remapped.", nr_moving);
let free_blocks = ranges_total(&free); let free_blocks = ranges_total(&free);
eprintln!("{} free blocks.", free_blocks); eprintln!("{} free blocks.", free_blocks);
if free_blocks < nr_moving { if free_blocks < pass1.nr_high_blocks {
// FIXME: return error
panic!("Insufficient space"); panic!("Insufficient space");
} }
let remaps = build_remaps(above, free); let remaps = build_remaps(above, free);
eprintln!("remappings {:?}.", remaps);
let regions = build_copy_regions(&remaps, pass1.block_size.unwrap() as u64); let regions = build_copy_regions(&remaps, pass1.block_size.unwrap() as u64);
//eprint!("Copying data...");
copier::copy(data_path, &regions)?; copier::copy(data_path, &regions)?;
//eprintln!("done.");
let output = OpenOptions::new() let output = OpenOptions::new()
.read(false) .read(false)