[thin_repair] fix regression in thin_repair
When opening the corrupted metadata we don't need to touch the space maps. This used to be achieved by pretending we were opening a metadata snap at block 0 (superblock location). But got changed in the recent rationalisation of the metadata constructors. This patch introduces a bool to the metadata OPEN constructor that says whether the space maps are needed or not.
This commit is contained in:
parent
e46bdfd4cc
commit
2815aeace9
@ -112,12 +112,14 @@ metadata::metadata(block_manager<>::ptr bm, open_type ot,
|
||||
}
|
||||
}
|
||||
|
||||
metadata::metadata(block_manager<>::ptr bm)
|
||||
metadata::metadata(block_manager<>::ptr bm, bool read_space_maps)
|
||||
{
|
||||
tm_ = open_tm(bm);
|
||||
sb_ = read_superblock(tm_->get_bm(), SUPERBLOCK_LOCATION);
|
||||
|
||||
open_space_maps();
|
||||
if (read_space_maps)
|
||||
open_space_maps();
|
||||
|
||||
open_btrees();
|
||||
}
|
||||
|
||||
|
@ -74,7 +74,7 @@ namespace thin_provisioning {
|
||||
// ii) Read the metadata snap as given in the superblock
|
||||
// iii) Read the metadata snap given on command line, checking it matches superblock.
|
||||
//
|
||||
metadata(block_manager<>::ptr bm); // (i)
|
||||
metadata(block_manager<>::ptr bm, bool read_space_maps = true); // (i)
|
||||
metadata(block_manager<>::ptr,
|
||||
boost::optional<block_address> metadata_snap); // (ii) and (iii)
|
||||
|
||||
|
@ -23,7 +23,7 @@ namespace {
|
||||
emitter::ptr e = create_restore_emitter(new_md);
|
||||
|
||||
block_manager<>::ptr old_bm = open_bm(old_path, block_manager<>::READ_ONLY);
|
||||
metadata::ptr old_md(new metadata(old_bm));
|
||||
metadata::ptr old_md(new metadata(old_bm, false)); // we don't need to read the space maps
|
||||
metadata_dump(old_md, e, true);
|
||||
|
||||
} catch (std::exception &e) {
|
||||
|
Loading…
Reference in New Issue
Block a user