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

[thin_repair, metadata] Try harder to get the number of data blocks

Browse Source 
when opening the metadata.
This commit is contained in:
Joe Thornber
2016-03-21 17:17:57 +00:00
parent a21f97e405
commit b0e2d0e6a0
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
thin-provisioning/metadata_dumper.cc
View File

@@ -185,8 +185,13 @@ namespace {
d.creation_time_,
d.snapshotted_time_);
emit_mappings(tree_root);
try {
emit_mappings(tree_root);
} catch (exception &e) {
cerr << e.what();
e_->end_device();
throw;
}
e_->end_device();
} else if (!repair_) {
@@ -211,6 +216,19 @@ namespace {
bool repair_;
mapping_tree_detail::damage_visitor::ptr damage_policy_;
};
block_address get_nr_blocks(metadata::ptr md) {
if (md->data_sm_)
return md->data_sm_->get_nr_blocks();
else if (md->sb_.blocknr_ == superblock_detail::SUPERBLOCK_LOCATION)
// grab from the root structure of the space map
return get_nr_blocks_in_data_sm(*md->tm_, &md->sb_.data_space_map_root_);
else
// metadata snap, we really don't know
return 0ull;
}
}
//----------------------------------------------------------------
@@ -222,14 +240,10 @@ thin_provisioning::metadata_dump(metadata::ptr md, emitter::ptr e, bool repair)
device_tree_detail::damage_visitor::ptr dd_policy(details_damage_policy(repair));
walk_device_tree(*md->details_, de, *dd_policy);
// metadata snap doesn't have the space maps so we don't know how
// many data blocks there are.
block_address nr_data_blocks = md->data_sm_ ? md->data_sm_->get_nr_blocks() : 0;
e->begin_superblock("", md->sb_.time_,
md->sb_.trans_id_,
md->sb_.data_block_size_,
nr_data_blocks,
get_nr_blocks(md),
boost::optional<block_address>());
{

6
thin-provisioning/thin_repair.cc
View File

@@ -24,11 +24,7 @@ namespace {
block_manager<>::ptr old_bm = open_bm(old_path, block_manager<>::READ_ONLY);
// we need to read the space maps to get the size
// of the data device. This is a shame, since any
// corruption in the sms will cause the repair to
// fail.
metadata::ptr old_md(new metadata(old_bm, true));
metadata::ptr old_md(new metadata(old_bm, false));
metadata_dump(old_md, e, true);
} catch (std::exception &e) {