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

Corrupt superblock repair

Browse Source
This commit is contained in:
Nikhil Kshirsagar
2019-10-25 15:02:56 +05:30
parent 0fc7529c01
commit 91b4714e38
14 changed files with 674 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
thin-provisioning/thin_repair.cc
View File

@@ -17,27 +17,28 @@ using namespace std;
using namespace thin_provisioning;
namespace {
int repair(string const &old_path, string const &new_path) {
bool metadata_touched = false;
try {
// block size gets updated by the restorer
block_manager<>::ptr new_bm = open_bm(new_path, block_manager<>::READ_WRITE);
file_utils::check_file_exists(old_path, false);
metadata_touched = true;
metadata::ptr new_md(new metadata(new_bm, metadata::CREATE, 128, 0));
emitter::ptr e = create_restore_emitter(new_md);
block_manager<>::ptr old_bm = open_bm(old_path, block_manager<>::READ_ONLY);
metadata_repair(old_bm, e);
int repair(string const &old_path, string const &new_path, override_options const &opts) {
bool metadata_touched = false;
try {
// block size gets updated by the restorer
block_manager<>::ptr new_bm = open_bm(new_path, block_manager<>::READ_WRITE);
file_utils::check_file_exists(old_path, false);
metadata_touched = true;
metadata::ptr new_md(new metadata(new_bm, metadata::CREATE, 128, 0));
emitter::ptr inner = create_restore_emitter(new_md);
emitter::ptr e = create_override_emitter(inner, opts);
block_manager<>::ptr old_bm = open_bm(old_path, block_manager<>::READ_ONLY);
metadata_repair(old_bm, e, opts);
} catch (std::exception &e) {
if (metadata_touched)
file_utils::zero_superblock(new_path);
cerr << e.what() << endl;
return 1;
}
} catch (std::exception &e) {
if (metadata_touched)
file_utils::zero_superblock(new_path);
cerr << e.what() << endl;
return 1;
}
return 0;
}
return 0;
}
}
//----------------------------------------------------------------
@@ -50,12 +51,15 @@ thin_repair_cmd::thin_repair_cmd()
void
thin_repair_cmd::usage(std::ostream &out) const
{
out << "Usage: " << get_name() << " [options] {device|file}" << endl
<< "Options:" << endl
<< " {-h|--help}" << endl
<< " {-i|--input} <input metadata (binary format)>" << endl
<< " {-o|--output} <output metadata (binary format)>" << endl
<< " {-V|--version}" << endl;
out << "Usage: " << get_name() << " [options] {device|file}" << endl
<< "Options:" << endl
<< " {-h|--help}" << endl
<< " {-i|--input} <input metadata (binary format)>" << endl
<< " {-o|--output} <output metadata (binary format)>" << endl
<< " {--transaction-id} <natural>" << endl
<< " {--data-block-size} <natural>" << endl
<< " {--nr-data-blocks} <natural>" << endl
<< " {-V|--version}" << endl;
}
int
@@ -63,39 +67,56 @@ thin_repair_cmd::run(int argc, char **argv)
{
int c;
boost::optional<string> input_path, output_path;
override_options opts;
const char shortopts[] = "hi:o:V";
const struct option longopts[] = {
{ "help", no_argument, NULL, 'h'},
{ "input", required_argument, NULL, 'i'},
{ "output", required_argument, NULL, 'o'},
{ "version", no_argument, NULL, 'V'},
{ NULL, no_argument, NULL, 0 }
};
const struct option longopts[] = {
{ "help", no_argument, NULL, 'h'},
{ "input", required_argument, NULL, 'i'},
{ "output", required_argument, NULL, 'o'},
{ "transaction-id", required_argument, NULL, 1},
{ "data-block-size", required_argument, NULL, 2},
{ "nr-data-blocks", required_argument, NULL, 3},
{ "version", no_argument, NULL, 'V'},
{ NULL, no_argument, NULL, 0 }
};
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch(c) {
case 'h':
usage(cout);
return 0;
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch(c) {
case 'h':
usage(cout);
return 0;
case 'i':
input_path = optarg;
break;
case 'i':
input_path = optarg;
break;
case 'o':
output_path = optarg;
break;
case 'o':
output_path = optarg;
break;
case 'V':
cout << THIN_PROVISIONING_TOOLS_VERSION << endl;
return 0;
case 1:
opts.transaction_id_ = parse_uint64(optarg, "transaction id");
break;
default:
usage(cerr);
return 1;
}
}
case 2:
opts.data_block_size_ = static_cast<uint32_t>(parse_uint64(optarg, "data block size"));
break;
case 3:
opts.nr_data_blocks_ = parse_uint64(optarg, "nr data blocks");
break;
case 'V':
cout << THIN_PROVISIONING_TOOLS_VERSION << endl;
return 0;
default:
usage(cerr);
return 1;
}
}
if (!input_path) {
cerr << "no input file provided" << endl;
@@ -112,7 +133,8 @@ thin_repair_cmd::run(int argc, char **argv)
return 1;
}
return repair(*input_path, *output_path);
return repair(*input_path, *output_path, opts);
}
//----------------------------------------------------------------