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

[thin_check (rust)] introduce ASpaceMap type alias

Browse Source
This commit is contained in:
Joe Thornber 2020-08-18 11:06:15 +01:00
parent 04f3ba5a33
commit 8eec84fbec
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pdata/space_map.rs
View File

@ -184,6 +184,8 @@ pub trait SpaceMap {
fn inc(&mut self, begin: u64, len: u64) -> Result<()>; fn inc(&mut self, begin: u64, len: u64) -> Result<()>;
} }
pub type ASpaceMap = Arc<Mutex<dyn SpaceMap + Sync + Send>>;
//------------------------------------------ //------------------------------------------
pub struct CoreSpaceMap<T> { pub struct CoreSpaceMap<T> {

25
src/thin/check.rs
View File

@ -43,7 +43,7 @@ impl Unpack for BlockTime {
} }
struct BottomLevelVisitor { struct BottomLevelVisitor {
data_sm: Arc<Mutex<dyn SpaceMap + Send>>, data_sm: ASpaceMap,
} }
//------------------------------------------ //------------------------------------------
@ -159,14 +159,15 @@ fn check_space_map(
ctx: &Context, ctx: &Context,
kind: &str, kind: &str,
entries: Vec<IndexEntry>, entries: Vec<IndexEntry>,
metadata_sm: Option<Arc<Mutex<dyn SpaceMap + Send + Sync>>>, metadata_sm: Option<ASpaceMap>,
sm: Arc<Mutex<dyn SpaceMap + Send + Sync>>, sm: ASpaceMap,
root: SMRoot, root: SMRoot,
) -> Result<()> { ) -> Result<()> {
let report = ctx.report.clone(); let report = ctx.report.clone();
let engine = ctx.engine.clone(); let engine = ctx.engine.clone();
let sm = sm.lock().unwrap(); let sm = sm.lock().unwrap();
// overflow btree // overflow btree
{ {
let mut v = OverflowChecker::new(&*sm); let mut v = OverflowChecker::new(&*sm);
@ -238,7 +239,7 @@ fn check_space_map(
//------------------------------------------ //------------------------------------------
fn inc_entries(sm: &Arc<Mutex<dyn SpaceMap + Sync + Send>>, entries: &[IndexEntry]) -> Result<()> { fn inc_entries(sm: &ASpaceMap, entries: &[IndexEntry]) -> Result<()> {
let mut sm = sm.lock().unwrap(); let mut sm = sm.lock().unwrap();
for ie in entries { for ie in entries {
sm.inc(ie.blocknr, 1)?; sm.inc(ie.blocknr, 1)?;
@ -246,6 +247,13 @@ fn inc_entries(sm: &Arc<Mutex<dyn SpaceMap + Sync + Send>>, entries: &[IndexEntr
Ok(()) Ok(())
} }
fn inc_superblock(sm: &ASpaceMap) -> Result<()>
{
let mut sm = sm.lock().unwrap();
sm.inc(SUPERBLOCK_LOCATION, 1)?;
Ok(())
}
//------------------------------------------ //------------------------------------------
const MAX_CONCURRENT_IO: u32 = 1024; const MAX_CONCURRENT_IO: u32 = 1024;
@ -375,6 +383,7 @@ pub fn check(opts: ThinCheckOptions) -> Result<()> {
let devs = btree_to_map::<DeviceDetail>(engine.clone(), false, sb.details_root)?; let devs = btree_to_map::<DeviceDetail>(engine.clone(), false, sb.details_root)?;
let nr_devs = devs.len(); let nr_devs = devs.len();
let metadata_sm = core_sm(engine.get_nr_blocks(), nr_devs as u32); let metadata_sm = core_sm(engine.get_nr_blocks(), nr_devs as u32);
inc_superblock(&metadata_sm)?;
report.set_sub_title("device details tree"); report.set_sub_title("device details tree");
let _devs = btree_to_map_with_sm::<DeviceDetail>( let _devs = btree_to_map_with_sm::<DeviceDetail>(
@ -387,17 +396,11 @@ pub fn check(opts: ThinCheckOptions) -> Result<()> {
let (tid, stop_progress) = let (tid, stop_progress) =
spawn_progress_thread(metadata_sm.clone(), nr_allocated_metadata, report.clone())?; spawn_progress_thread(metadata_sm.clone(), nr_allocated_metadata, report.clone())?;
// increment superblock
{
let mut sm = metadata_sm.lock().unwrap();
sm.inc(SUPERBLOCK_LOCATION, 1)?;
}
// mapping top level // mapping top level
let roots = let roots =
btree_to_map_with_sm::<u64>(engine.clone(), metadata_sm.clone(), false, sb.mapping_root)?; btree_to_map_with_sm::<u64>(engine.clone(), metadata_sm.clone(), false, sb.mapping_root)?;
// Check the mappings filling in the data_sm as we go. // mapping bottom level
report.set_sub_title("mapping tree"); report.set_sub_title("mapping tree");
let root = unpack::<SMRoot>(&sb.data_sm_root[0..])?; let root = unpack::<SMRoot>(&sb.data_sm_root[0..])?;
let data_sm = core_sm(root.nr_blocks, nr_devs as u32); let data_sm = core_sm(root.nr_blocks, nr_devs as u32);