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

[thin_repair] fix regression in thin_repair

Browse Source 
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:
Joe Thornber 2016-02-16 14:08:43 +00:00
parent e46bdfd4cc
commit 2815aeace9
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
thin-provisioning/metadata.cc
View File

@ -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); tm_ = open_tm(bm);
sb_ = read_superblock(tm_->get_bm(), SUPERBLOCK_LOCATION); sb_ = read_superblock(tm_->get_bm(), SUPERBLOCK_LOCATION);
if (read_space_maps)
open_space_maps(); open_space_maps();
open_btrees(); open_btrees();
} }

2
thin-provisioning/metadata.h
View File

@ -74,7 +74,7 @@ namespace thin_provisioning {
// ii) Read the metadata snap as given in the superblock // ii) Read the metadata snap as given in the superblock
// iii) Read the metadata snap given on command line, checking it matches 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, metadata(block_manager<>::ptr,
boost::optional<block_address> metadata_snap); // (ii) and (iii) boost::optional<block_address> metadata_snap); // (ii) and (iii)

2
thin-provisioning/thin_repair.cc
View File

@ -23,7 +23,7 @@ namespace {
emitter::ptr e = create_restore_emitter(new_md); emitter::ptr e = create_restore_emitter(new_md);
block_manager<>::ptr old_bm = open_bm(old_path, block_manager<>::READ_ONLY); 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); metadata_dump(old_md, e, true);
} catch (std::exception &e) { } catch (std::exception &e) {