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

thin_dump: support optional block# with --metadata-snap to allow for default snapshot stored in metadata to be used; update manual page

Browse Source
This commit is contained in:
Heinz Mauelshagen
2013-07-19 11:48:15 +02:00
parent d7c1f91c97
commit dd1e4c1233
3 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
man8/thin_dump.8
View File

@@ -23,9 +23,12 @@ Print output in XML or human readable format.
.IP "\fB\-r, \-\-repair\fP".
.IP "\fB\-m, \-\-metadata_snap\fP block#".
Dump metadata snapshot created by device-mapper thin provisioning target at block#
.IP "\fB\-m, \-\-metadata_snap\fP [block#]".
Dump metadata snapshot created by device-mapper thin provisioning target.
If block is not provided, access the default metadata snapshot created by
the thin provisioning device-mapper target, else try the one at block#.
See the thin provisioning target documentation on how to create or release
a metadata snapshot.
.IP "\fB\-h, \-\-help\fP".
Print help and exit.
@@ -44,6 +47,13 @@ to standard output in XML format:
.sp
.B thin_dump /dev/vg/metadata
Dumps the thin provisioning metadata snapshot on logical volume /dev/vg/metadata
to standard output in human readable format (not processable by
.B thin_restore(8)
):
.sp
.B thin_dump --format human_readable --metadata-snap /dev/vg/metadata
.SH DIAGNOSTICS
.B thin_dump
returns an exit code of 0 for success or 1 for error.

1
thin-provisioning/metadata.cc
View File

@@ -78,6 +78,7 @@ namespace {
<< "data block size " << sb.data_block_size_ << endl
<< "metadata block size " << sb.metadata_block_size_ << endl
<< "metadata nr blocks " << sb.metadata_nr_blocks_ << endl
<< "metadata snapshot block " << sb.metadata_snap_ << endl
;
}
}

62
thin-provisioning/thin_dump.cc
View File

@@ -31,23 +31,37 @@ using namespace persistent_data;
using namespace std;
using namespace thin_provisioning;
struct flags {
bool find_metadata_snap;
bool repair;
};
namespace {
int dump(string const &path, ostream &out, string const &format, bool repair,
int dump(string const &path, ostream *out, string const &format, struct flags &flags,
block_address metadata_snap = 0) {
try {
metadata::ptr md(metadata_snap ? new metadata(path, metadata_snap) : new metadata(path, metadata::OPEN, 0, 0));
metadata::ptr md(new metadata(path, metadata_snap));
emitter::ptr e;
uint64_t metadata_snap_root = md->sb_.metadata_snap_;
if (metadata_snap_root) {
md.reset();
md = metadata::ptr(new metadata(path, metadata_snap_root));
} else if (flags.find_metadata_snap) {
cerr << "no metadata snapshot found!" << endl;
exit(1);
}
if (format == "xml")
e = create_xml_emitter(out);
e = create_xml_emitter(*out);
else if (format == "human_readable")
e = create_human_readable_emitter(out);
e = create_human_readable_emitter(*out);
else {
cerr << "unknown format '" << format << "'" << endl;
exit(1);
}
metadata_dump(md, e, repair);
metadata_dump(md, e, flags.repair);
} catch (std::exception &e) {
cerr << e.what() << endl;
@@ -63,7 +77,7 @@ namespace {
<< " {-h|--help}" << endl
<< " {-f|--format} {xml|human_readable}" << endl
<< " {-r|--repair}" << endl
<< " {-m|--metadata-snap} block#" << endl
<< " {-m|--metadata-snap} [block#]" << endl
<< " {-o <xml file>}" << endl
<< " {-V|--version}" << endl;
}
@@ -72,16 +86,16 @@ namespace {
int main(int argc, char **argv)
{
int c;
bool repair = false;
char const *output = NULL;
const char shortopts[] = "hm:o:f:rV";
const char shortopts[] = "hm::o:f:rV";
char *end_ptr;
string format = "xml";
block_address metadata_snap = 0;
char *end_ptr;
struct flags flags = { .find_metadata_snap = false, .repair = false };
const struct option longopts[] = {
{ "help", no_argument, NULL, 'h'},
{ "metadata-snap", required_argument, NULL, 'm' },
{ "metadata-snap", optional_argument, NULL, 'm' },
{ "output", required_argument, NULL, 'o'},
{ "format", required_argument, NULL, 'f' },
{ "repair", no_argument, NULL, 'r'},
@@ -100,16 +114,24 @@ int main(int argc, char **argv)
break;
case 'r':
repair = true;
flags.repair = true;
break;
case 's':
flags.find_metadata_snap = true;
break;
case 'm':
metadata_snap = strtoull(optarg, &end_ptr, 10);
if (end_ptr == optarg) {
cerr << "couldn't parse <metadata_snap>" << endl;
usage(cerr, basename(argv[0]));
return 1;
}
if (optarg) {
metadata_snap = strtoull(optarg, &end_ptr, 10);
if (end_ptr == optarg) {
cerr << "couldn't parse <metadata_snap>" << endl;
usage(cerr, basename(argv[0]));
return 1;
}
} else
flags.find_metadata_snap = true;
break;
case 'o':
@@ -132,9 +154,5 @@ int main(int argc, char **argv)
return 1;
}
if (output) {
ofstream out(output);
return dump(argv[optind], out, format, repair, metadata_snap);
} else
return dump(argv[optind], cout, format, repair, metadata_snap);
return dump(argv[optind], output ? new ofstream(output) : &cout, format, flags, metadata_snap);
}