[thin_check] Check the ref counts in the data space map.

Hadn't realised this was being done.
This commit is contained in:
Joe Thornber 2020-05-28 14:35:51 +01:00
parent 128ecc27f2
commit c94f560be8
2 changed files with 84 additions and 20 deletions

View File

@ -18,11 +18,13 @@
#include "base/nested_output.h" #include "base/nested_output.h"
#include "persistent-data/file_utils.h" #include "persistent-data/file_utils.h"
#include "persistent-data/space-maps/core.h"
#include "thin-provisioning/metadata.h" #include "thin-provisioning/metadata.h"
#include "thin-provisioning/metadata_checker.h" #include "thin-provisioning/metadata_checker.h"
#include "thin-provisioning/metadata_counter.h" #include "thin-provisioning/metadata_counter.h"
#include "thin-provisioning/superblock.h" #include "thin-provisioning/superblock.h"
using namespace boost;
using namespace persistent_data; using namespace persistent_data;
using namespace thin_provisioning; using namespace thin_provisioning;
@ -84,6 +86,20 @@ namespace {
//-------------------------------- //--------------------------------
class data_ref_counter : public mapping_tree_detail::mapping_visitor {
public:
data_ref_counter(space_map::ptr sm)
: sm_(sm) {
}
virtual void visit(btree_path const &path, mapping_tree_detail::block_time const &bt) {
sm_->inc(bt.block_);
}
private:
space_map::ptr sm_;
};
class mapping_reporter : public mapping_tree_detail::damage_visitor { class mapping_reporter : public mapping_tree_detail::damage_visitor {
public: public:
mapping_reporter(nested_output &out) mapping_reporter(nested_output &out)
@ -161,13 +177,19 @@ namespace {
error_state examine_mapping_tree_(transaction_manager::ptr tm, error_state examine_mapping_tree_(transaction_manager::ptr tm,
superblock_detail::superblock const &sb, superblock_detail::superblock const &sb,
nested_output &out) { nested_output &out,
optional<space_map::ptr> data_sm) {
out << "examining mapping tree" << end_message(); out << "examining mapping tree" << end_message();
nested_output::nest _ = out.push(); nested_output::nest _ = out.push();
mapping_reporter mapping_rep(out); mapping_reporter mapping_rep(out);
mapping_tree mtree(*tm, sb.data_mapping_root_, mapping_tree mtree(*tm, sb.data_mapping_root_,
mapping_tree_detail::block_traits::ref_counter(tm->get_sm())); mapping_tree_detail::block_traits::ref_counter(tm->get_sm()));
if (data_sm) {
data_ref_counter dcounter(*data_sm);
walk_mapping_tree(mtree, dcounter, mapping_rep);
} else
check_mapping_tree(mtree, mapping_rep); check_mapping_tree(mtree, mapping_rep);
return mapping_rep.get_error(); return mapping_rep.get_error();
@ -184,9 +206,10 @@ namespace {
error_state examine_mapping_tree(transaction_manager::ptr tm, error_state examine_mapping_tree(transaction_manager::ptr tm,
superblock_detail::superblock const &sb, superblock_detail::superblock const &sb,
nested_output &out) { nested_output &out,
optional<space_map::ptr> data_sm) {
error_state err = examine_devices_tree_(tm, sb, out); error_state err = examine_devices_tree_(tm, sb, out);
err << examine_mapping_tree_(tm, sb, out); err << examine_mapping_tree_(tm, sb, out, data_sm);
return err; return err;
} }
@ -222,6 +245,34 @@ namespace {
return err; return err;
} }
error_state compare_space_maps(space_map::ptr actual, space_map::ptr expected,
nested_output &out)
{
error_state err = NO_ERROR;
auto nr_blocks = actual->get_nr_blocks();
if (expected->get_nr_blocks() != nr_blocks) {
out << "internal error: nr blocks in space maps differ"
<< end_message();
err << FATAL;
} else {
for (block_address b = 0; b < nr_blocks; b++) {
auto a_count = actual->get_count(b);
auto e_count = actual->get_count(b);
if (a_count != e_count) {
out << "data reference counts differ for block " << b
<< ", expected " << e_count
<< ", but got " << a_count
<< end_message();
err << (a_count > e_count ? NON_FATAL : FATAL);
}
}
}
return err;
}
void print_info(transaction_manager::ptr tm, void print_info(transaction_manager::ptr tm,
superblock_detail::superblock const &sb, superblock_detail::superblock const &sb,
nested_output &out) nested_output &out)
@ -272,12 +323,22 @@ namespace {
print_info(tm, sb, info_out_); print_info(tm, sb, info_out_);
err << examine_data_mappings(tm, sb, options_.check_data_mappings_, out_); if (options_.sm_opts_ == check_options::SPACE_MAP_FULL) {
space_map::ptr data_sm{open_disk_sm(*tm, &sb.data_space_map_root_)};
optional<space_map::ptr> core_sm{create_core_map(data_sm->get_nr_blocks())};
err << examine_data_mappings(tm, sb, options_.check_data_mappings_, out_, core_sm);
// if we're checking everything, and there were no errors, // if we're checking everything, and there were no errors,
// then we should check the space maps too. // then we should check the space maps too.
if (err != FATAL) if (err != FATAL) {
err << examine_metadata_space_map(tm, sb, options_.check_metadata_space_map_, out_); err << examine_metadata_space_map(tm, sb, options_.sm_opts_, out_);
if (core_sm)
err << compare_space_maps(data_sm, *core_sm, out_);
}
} else
err << examine_data_mappings(tm, sb, options_.check_data_mappings_, out_,
optional<space_map::ptr>());
return err; return err;
} }
@ -287,7 +348,8 @@ namespace {
examine_data_mappings(transaction_manager::ptr tm, examine_data_mappings(transaction_manager::ptr tm,
superblock_detail::superblock const &sb, superblock_detail::superblock const &sb,
check_options::data_mapping_options option, check_options::data_mapping_options option,
nested_output &out) { nested_output &out,
optional<space_map::ptr> data_sm) {
error_state err = NO_ERROR; error_state err = NO_ERROR;
switch (option) { switch (option) {
@ -295,7 +357,7 @@ namespace {
err << examine_top_level_mapping_tree(tm, sb, out); err << examine_top_level_mapping_tree(tm, sb, out);
break; break;
case check_options::DATA_MAPPING_LEVEL2: case check_options::DATA_MAPPING_LEVEL2:
err << examine_mapping_tree(tm, sb, out); err << examine_mapping_tree(tm, sb, out, data_sm);
break; break;
default: default:
break; // do nothing break; // do nothing
@ -307,12 +369,12 @@ namespace {
static error_state static error_state
examine_metadata_space_map(transaction_manager::ptr tm, examine_metadata_space_map(transaction_manager::ptr tm,
superblock_detail::superblock const &sb, superblock_detail::superblock const &sb,
check_options::metadata_space_map_options option, check_options::space_map_options option,
nested_output &out) { nested_output &out) {
error_state err = NO_ERROR; error_state err = NO_ERROR;
switch (option) { switch (option) {
case check_options::METADATA_SPACE_MAP_FULL: case check_options::SPACE_MAP_FULL:
err << check_space_map_counts(tm, sb, out); err << check_space_map_counts(tm, sb, out);
break; break;
default: default:
@ -333,17 +395,17 @@ namespace {
check_options::check_options() check_options::check_options()
: check_data_mappings_(DATA_MAPPING_LEVEL2), : check_data_mappings_(DATA_MAPPING_LEVEL2),
check_metadata_space_map_(METADATA_SPACE_MAP_FULL) { sm_opts_(SPACE_MAP_FULL) {
} }
void check_options::set_superblock_only() { void check_options::set_superblock_only() {
check_data_mappings_ = DATA_MAPPING_NONE; check_data_mappings_ = DATA_MAPPING_NONE;
check_metadata_space_map_ = METADATA_SPACE_MAP_NONE; sm_opts_ = SPACE_MAP_NONE;
} }
void check_options::set_skip_mappings() { void check_options::set_skip_mappings() {
check_data_mappings_ = DATA_MAPPING_LEVEL1; check_data_mappings_ = DATA_MAPPING_LEVEL1;
check_metadata_space_map_ = METADATA_SPACE_MAP_NONE; sm_opts_ = SPACE_MAP_NONE;
} }
void check_options::set_override_mapping_root(block_address b) { void check_options::set_override_mapping_root(block_address b) {

View File

@ -33,9 +33,9 @@ namespace thin_provisioning {
DATA_MAPPING_LEVEL2, DATA_MAPPING_LEVEL2,
}; };
enum metadata_space_map_options { enum space_map_options {
METADATA_SPACE_MAP_NONE, SPACE_MAP_NONE,
METADATA_SPACE_MAP_FULL, SPACE_MAP_FULL,
}; };
check_options(); check_options();
@ -45,7 +45,9 @@ namespace thin_provisioning {
void set_override_mapping_root(bcache::block_address b); void set_override_mapping_root(bcache::block_address b);
data_mapping_options check_data_mappings_; data_mapping_options check_data_mappings_;
metadata_space_map_options check_metadata_space_map_;
space_map_options sm_opts_;
boost::optional<bcache::block_address> override_mapping_root_; boost::optional<bcache::block_address> override_mapping_root_;
}; };