[thin_check] Add support for --metadata-snap.
Not tested yet.
This commit is contained in:
parent
01a7462ece
commit
86704deacb
|
@ -29,6 +29,7 @@ Options:
|
||||||
{-q|--quiet}
|
{-q|--quiet}
|
||||||
{-h|--help}
|
{-h|--help}
|
||||||
{-V|--version}
|
{-V|--version}
|
||||||
|
{-m|--metadata-snap}
|
||||||
{--override-mapping-root}
|
{--override-mapping-root}
|
||||||
{--clear-needs-check-flag}
|
{--clear-needs-check-flag}
|
||||||
{--ignore-non-fatal-errors}
|
{--ignore-non-fatal-errors}
|
||||||
|
|
|
@ -137,12 +137,13 @@ namespace {
|
||||||
//--------------------------------
|
//--------------------------------
|
||||||
|
|
||||||
error_state examine_superblock(block_manager::ptr bm,
|
error_state examine_superblock(block_manager::ptr bm,
|
||||||
|
block_address sb_location,
|
||||||
nested_output &out) {
|
nested_output &out) {
|
||||||
out << "examining superblock" << end_message();
|
out << "examining superblock" << end_message();
|
||||||
nested_output::nest _ = out.push();
|
nested_output::nest _ = out.push();
|
||||||
|
|
||||||
superblock_reporter sb_rep(out);
|
superblock_reporter sb_rep(out);
|
||||||
check_superblock(bm, sb_rep);
|
check_superblock(bm, sb_rep, sb_location);
|
||||||
|
|
||||||
return sb_rep.get_error();
|
return sb_rep.get_error();
|
||||||
}
|
}
|
||||||
|
@ -307,18 +308,24 @@ namespace {
|
||||||
|
|
||||||
error_state check() {
|
error_state check() {
|
||||||
error_state err = NO_ERROR;
|
error_state err = NO_ERROR;
|
||||||
|
auto sb_location = superblock_detail::SUPERBLOCK_LOCATION;
|
||||||
|
|
||||||
err << examine_superblock(bm_, out_);
|
if (options_.use_metadata_snap_) {
|
||||||
|
superblock_detail::superblock sb = read_superblock(bm_, sb_location);
|
||||||
|
sb_location = sb.metadata_snap_;
|
||||||
|
if (sb_location == superblock_detail::SUPERBLOCK_LOCATION)
|
||||||
|
throw runtime_error("No metadata snapshot found.");
|
||||||
|
}
|
||||||
|
|
||||||
|
err << examine_superblock(bm_, sb_location, out_);
|
||||||
if (err == FATAL) {
|
if (err == FATAL) {
|
||||||
if (check_for_xml(bm_))
|
if (check_for_xml(bm_))
|
||||||
out_ << "This looks like XML. thin_check only checks the binary metadata format." << end_message();
|
out_ << "This looks like XML. thin_check only checks the binary metadata format." << end_message();
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
superblock_detail::superblock sb = read_superblock(bm_);
|
superblock_detail::superblock sb = read_superblock(bm_, sb_location);
|
||||||
transaction_manager::ptr tm =
|
transaction_manager::ptr tm = open_tm(bm_, sb_location);
|
||||||
open_tm(bm_, superblock_detail::SUPERBLOCK_LOCATION);
|
|
||||||
sb.data_mapping_root_ = mapping_root(sb, options_);
|
sb.data_mapping_root_ = mapping_root(sb, options_);
|
||||||
|
|
||||||
print_info(tm, sb, info_out_);
|
print_info(tm, sb, info_out_);
|
||||||
|
@ -412,6 +419,10 @@ void check_options::set_override_mapping_root(block_address b) {
|
||||||
override_mapping_root_ = b;
|
override_mapping_root_ = b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void check_options::set_metadata_snap() {
|
||||||
|
sm_opts_ = SPACE_MAP_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
base::error_state
|
base::error_state
|
||||||
thin_provisioning::check_metadata(block_manager::ptr bm,
|
thin_provisioning::check_metadata(block_manager::ptr bm,
|
||||||
check_options const &check_opts,
|
check_options const &check_opts,
|
||||||
|
|
|
@ -43,11 +43,11 @@ namespace thin_provisioning {
|
||||||
void set_superblock_only();
|
void set_superblock_only();
|
||||||
void set_skip_mappings();
|
void set_skip_mappings();
|
||||||
void set_override_mapping_root(bcache::block_address b);
|
void set_override_mapping_root(bcache::block_address b);
|
||||||
|
void set_metadata_snap();
|
||||||
|
|
||||||
|
bool use_metadata_snap_;
|
||||||
data_mapping_options check_data_mappings_;
|
data_mapping_options check_data_mappings_;
|
||||||
|
|
||||||
space_map_options sm_opts_;
|
space_map_options sm_opts_;
|
||||||
|
|
||||||
boost::optional<bcache::block_address> override_mapping_root_;
|
boost::optional<bcache::block_address> override_mapping_root_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -194,11 +194,12 @@ namespace thin_provisioning {
|
||||||
|
|
||||||
void
|
void
|
||||||
check_superblock(block_manager::ptr bm,
|
check_superblock(block_manager::ptr bm,
|
||||||
superblock_detail::damage_visitor &visitor) {
|
superblock_detail::damage_visitor &visitor,
|
||||||
|
block_address sb_location) {
|
||||||
using namespace superblock_detail;
|
using namespace superblock_detail;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
bm->read_lock(SUPERBLOCK_LOCATION, superblock_validator());
|
bm->read_lock(sb_location, superblock_validator());
|
||||||
|
|
||||||
} catch (std::exception const &e) {
|
} catch (std::exception const &e) {
|
||||||
visitor.visit(superblock_corruption(e.what()));
|
visitor.visit(superblock_corruption(e.what()));
|
||||||
|
|
|
@ -139,7 +139,8 @@ namespace thin_provisioning {
|
||||||
superblock_detail::superblock const &sb);
|
superblock_detail::superblock const &sb);
|
||||||
|
|
||||||
void check_superblock(persistent_data::block_manager::ptr bm,
|
void check_superblock(persistent_data::block_manager::ptr bm,
|
||||||
superblock_detail::damage_visitor &visitor);
|
superblock_detail::damage_visitor &visitor,
|
||||||
|
persistent_data::block_address sb_location = superblock_detail::SUPERBLOCK_LOCATION);
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------
|
//----------------------------------------------------------------
|
||||||
|
|
|
@ -109,15 +109,16 @@ thin_check_cmd::thin_check_cmd()
|
||||||
void
|
void
|
||||||
thin_check_cmd::usage(std::ostream &out) const
|
thin_check_cmd::usage(std::ostream &out) const
|
||||||
{
|
{
|
||||||
out << "Usage: " << get_name() << " [options] {device|file}" << endl
|
out << "Usage: " << get_name() << " [options] {device|file}\n"
|
||||||
<< "Options:" << endl
|
<< "Options:\n"
|
||||||
<< " {-q|--quiet}" << endl
|
<< " {-q|--quiet}\n"
|
||||||
<< " {-h|--help}" << endl
|
<< " {-h|--help}\n"
|
||||||
<< " {-V|--version}" << endl
|
<< " {-V|--version}\n"
|
||||||
<< " {--override-mapping-root}" << endl
|
<< " {-m|--metadata-snap}\n"
|
||||||
<< " {--clear-needs-check-flag}" << endl
|
<< " {--override-mapping-root}\n"
|
||||||
<< " {--ignore-non-fatal-errors}" << endl
|
<< " {--clear-needs-check-flag}\n"
|
||||||
<< " {--skip-mappings}" << endl
|
<< " {--ignore-non-fatal-errors}\n"
|
||||||
|
<< " {--skip-mappings}\n"
|
||||||
<< " {--super-block-only}" << endl;
|
<< " {--super-block-only}" << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,6 +133,7 @@ thin_check_cmd::run(int argc, char **argv)
|
||||||
{ "quiet", no_argument, NULL, 'q'},
|
{ "quiet", no_argument, NULL, 'q'},
|
||||||
{ "help", no_argument, NULL, 'h'},
|
{ "help", no_argument, NULL, 'h'},
|
||||||
{ "version", no_argument, NULL, 'V'},
|
{ "version", no_argument, NULL, 'V'},
|
||||||
|
{ "metadata-snap", no_argument, NULL, 'm'},
|
||||||
{ "super-block-only", no_argument, NULL, 1},
|
{ "super-block-only", no_argument, NULL, 1},
|
||||||
{ "skip-mappings", no_argument, NULL, 2},
|
{ "skip-mappings", no_argument, NULL, 2},
|
||||||
{ "ignore-non-fatal-errors", no_argument, NULL, 3},
|
{ "ignore-non-fatal-errors", no_argument, NULL, 3},
|
||||||
|
@ -154,6 +156,10 @@ thin_check_cmd::run(int argc, char **argv)
|
||||||
cout << THIN_PROVISIONING_TOOLS_VERSION << endl;
|
cout << THIN_PROVISIONING_TOOLS_VERSION << endl;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
case 'm':
|
||||||
|
fs.check_opts.set_metadata_snap();
|
||||||
|
break;
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
// super-block-only
|
// super-block-only
|
||||||
fs.check_opts.set_superblock_only();
|
fs.check_opts.set_superblock_only();
|
||||||
|
@ -185,6 +191,12 @@ thin_check_cmd::run(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (fs.clear_needs_check_flag_on_success && fs.check_opts.use_metadata_snap_) {
|
||||||
|
cerr << "--metadata-snap cannot be combined with --clear-needs-check-flag.";
|
||||||
|
usage(cerr);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
if (argc == optind) {
|
if (argc == optind) {
|
||||||
if (!fs.quiet) {
|
if (!fs.quiet) {
|
||||||
cerr << "No input file provided." << endl;
|
cerr << "No input file provided." << endl;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user