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

[thin_delta] support metadata snapshots

Browse Source
This commit is contained in:
Joe Thornber 2015-03-25 11:10:18 +00:00
parent 0e72f772d0
commit cc44652cc3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
thin-provisioning/thin_delta.cc
View File

@ -33,7 +33,7 @@ namespace local {
<< "Options:\n" << "Options:\n"
<< " {--thin1, --snap1}\n" << " {--thin1, --snap1}\n"
<< " {--thin2, --snap2}\n" << " {--thin2, --snap2}\n"
<< " {-m, --metadata-snap}\n" << " {-m, --metadata-snap} [block#]\n"
<< " {--verbose}\n" << " {--verbose}\n"
<< " {-h|--help}\n" << " {-h|--help}\n"
<< " {-V|--version}" << endl; << " {-V|--version}" << endl;
@ -45,13 +45,13 @@ namespace local {
exit(1); exit(1);
} }
uint64_t parse_snap(string const &str) { uint64_t parse_int(string const &str, string const &desc) {
try { try {
return boost::lexical_cast<uint64_t>(str); return boost::lexical_cast<uint64_t>(str);
} catch (...) { } catch (...) {
ostringstream out; ostringstream out;
out << "Couldn't parse snapshot designator: '" << str << "'"; out << "Couldn't parse " << desc << ": '" << str << "'";
die(out.str()); die(out.str());
} }
@ -68,6 +68,7 @@ namespace local {
} }
boost::optional<string> dev; boost::optional<string> dev;
boost::optional<uint64_t> metadata_snap;
boost::optional<uint64_t> snap1; boost::optional<uint64_t> snap1;
boost::optional<uint64_t> snap2; boost::optional<uint64_t> snap2;
bool verbose; bool verbose;
@ -535,7 +536,7 @@ namespace local {
block_manager<>::ptr bm = open_bm(*fs.dev); block_manager<>::ptr bm = open_bm(*fs.dev);
transaction_manager::ptr tm = open_tm(bm); transaction_manager::ptr tm = open_tm(bm);
sb = read_superblock(bm); sb = fs.metadata_snap ? read_superblock(bm, *fs.metadata_snap) : read_superblock(bm);
data_sm = open_disk_sm(*tm, static_cast<void *>(&sb.data_space_map_root_)); data_sm = open_disk_sm(*tm, static_cast<void *>(&sb.data_space_map_root_));
dev_tree dtree(*tm, sb.data_mapping_root_, dev_tree dtree(*tm, sb.data_mapping_root_,
@ -638,15 +639,15 @@ int thin_delta_main(int argc, char **argv)
return 0; return 0;
case 1: case 1:
fs.snap1 = app.parse_snap(optarg); fs.snap1 = app.parse_int(optarg, "thin id 1");
break; break;
case 2: case 2:
fs.snap2 = app.parse_snap(optarg); fs.snap2 = app.parse_int(optarg, "thin id 2");
break; break;
case 'm': case 'm':
abort(); fs.metadata_snap = app.parse_int(optarg, "metadata snapshot block");
break; break;
case 4: case 4: