From eb406a953fdef6f874ad6c10419fdd96189096b7 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Tue, 30 Jul 2013 19:55:52 +0200 Subject: [PATCH 1/9] manual page fixes in header --- man8/thin_check.8 | 2 +- man8/thin_rmap.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man8/thin_check.8 b/man8/thin_check.8 index 1489078..a8dc81b 100644 --- a/man8/thin_check.8 +++ b/man8/thin_check.8 @@ -1,4 +1,4 @@ -.TH THIN_REPAIR 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.TH THIN_CHECK 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- .SH NAME thin_check \- repair thin provisioning metadata on device or file diff --git a/man8/thin_rmap.8 b/man8/thin_rmap.8 index 4d74520..684c86c 100644 --- a/man8/thin_rmap.8 +++ b/man8/thin_rmap.8 @@ -1,4 +1,4 @@ -.TH THIN_DUMP 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.TH THIN_RMAP(g 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- .SH NAME thin_rmap \- output reverse map of a thin provisioned region of blocks from metadata device or file From 6dbd7209edf8308e538f647b4b1f7a72d4d74c90 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Wed, 31 Jul 2013 12:07:16 +0200 Subject: [PATCH 2/9] Fix missing quote in xml output with metadata_snap= --- thin-provisioning/xml_format.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thin-provisioning/xml_format.cc b/thin-provisioning/xml_format.cc index 7125b4c..55007ca 100644 --- a/thin-provisioning/xml_format.cc +++ b/thin-provisioning/xml_format.cc @@ -59,7 +59,7 @@ namespace { << " nr_data_blocks=\"" << nr_data_blocks; if (metadata_snap) - out_ << " metadata_snap=\"" << *metadata_snap; + out_ << "\" metadata_snap=\"" << *metadata_snap; out_ << "\">" << endl; From 4c5ae4a78505dc01751ab06c4028dc03f6cf1e6c Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 2 Aug 2013 13:14:07 +0100 Subject: [PATCH 3/9] update Gemfile.lock --- Gemfile.lock | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4994d34..16b0c75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,20 +8,22 @@ GEM builder (3.2.2) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) - cucumber (1.3.2) + cucumber (1.3.5) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12.0) - multi_json (~> 1.3) + multi_json (~> 1.7.5) + multi_test (>= 0.0.2) diff-lcs (1.2.4) ejt_command_line (0.0.2) ffi (1.9.0) gherkin (2.12.0) multi_json (~> 1.3) multi_json (1.7.7) - rspec-expectations (2.13.0) + multi_test (0.0.2) + rspec-expectations (2.14.0) diff-lcs (>= 1.1.3, < 2.0) - thinp_xml (0.0.3) + thinp_xml (0.0.6) ejt_command_line (= 0.0.2) PLATFORMS From d779b6c1fa9d4e9c436525faa45c6410a8f9eb5a Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 2 Aug 2013 13:14:49 +0100 Subject: [PATCH 4/9] [thin_repair] don't open the space maps in the old metadata, we'll regenerate. --- thin-provisioning/thin_repair.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thin-provisioning/thin_repair.cc b/thin-provisioning/thin_repair.cc index 4921ee9..f1b078a 100644 --- a/thin-provisioning/thin_repair.cc +++ b/thin-provisioning/thin_repair.cc @@ -19,7 +19,7 @@ namespace { metadata::ptr new_md(new metadata(new_path, metadata::CREATE, 128, 0)); emitter::ptr e = create_restore_emitter(new_md); - metadata::ptr old_md(new metadata(old_path, metadata::OPEN)); + metadata::ptr old_md(new metadata(old_path)); metadata_dump(old_md, e, true); } catch (std::exception &e) { From e197a724c75fcf6547f17dfafe80453155edba26 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 2 Aug 2013 13:15:36 +0100 Subject: [PATCH 5/9] bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ee1372d..abd4105 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.2 +0.2.4 From feadce51b83156672383faf06dd67c0d013affd9 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 18 Oct 2013 16:17:06 +0200 Subject: [PATCH 6/9] Add missing cache tools manual pages and update Makefile.in respectively --- Makefile.in | 8 ++++++ man8/cache_check.8 | 62 ++++++++++++++++++++++++++++++++++++++++++ man8/cache_dump.8 | 59 ++++++++++++++++++++++++++++++++++++++++ man8/cache_repair.8 | 61 +++++++++++++++++++++++++++++++++++++++++ man8/cache_restore.8 | 64 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 254 insertions(+) create mode 100644 man8/cache_check.8 create mode 100644 man8/cache_dump.8 create mode 100644 man8/cache_repair.8 create mode 100644 man8/cache_restore.8 diff --git a/Makefile.in b/Makefile.in index e0ce06f..73326b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -299,6 +299,10 @@ distclean: clean install: $(PROGRAMS) $(INSTALL_DIR) $(BINDIR) + $(INSTALL_PROGRAM) cache_check $(BINDIR) + $(INSTALL_PROGRAM) cache_dump $(BINDIR) + $(INSTALL_PROGRAM) cache_repair $(BINDIR) + $(INSTALL_PROGRAM) cache_restore $(BINDIR) $(INSTALL_PROGRAM) thin_check $(BINDIR) $(INSTALL_PROGRAM) thin_dump $(BINDIR) $(INSTALL_PROGRAM) thin_repair $(BINDIR) @@ -306,6 +310,10 @@ install: $(PROGRAMS) $(INSTALL_PROGRAM) thin_rmap $(BINDIR) $(INSTALL_PROGRAM) thin_metadata_size $(BINDIR) $(INSTALL_DIR) $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_check.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_dump.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_repair.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_restore.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_check.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_dump.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_repair.8 $(MANPATH)/man8 diff --git a/man8/cache_check.8 b/man8/cache_check.8 new file mode 100644 index 0000000..5cc7dff --- /dev/null +++ b/man8/cache_check.8 @@ -0,0 +1,62 @@ +.TH CACHE_CHECK 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +cache_check \- repair cache metadata on device or file + +.SH SYNOPSIS +.B cache_check +.RB [ options ] +.I {device|file} + +.SH DESCRIPTION +.B cache_check +checks cache metadata created by +the device-mapper cache target on a +.I device +or +.I file. + +.SH OPTIONS +.IP "\fB\-q, \-\-quiet\fP" +Suppress output messages, return only exit code. + +.IP "\fB\-h, \-\-help\fP" +Print help and exit. + +.IP "\fB\-V, \-\-version\fP" +Output version information and exit. + +.IP "\fB\-\-super\-block\-only\fP" +Only check the superblock is present. + +.IP "\fB\-\-skip-mappings\fP" +Skip checking of the block mappings which make up the bulk of the +metadata. + +.IP "\fB\-\-skip-hints\fP" +Skip checking of the policy hint values metadata. + +.IP "\fB\-\-skip-discards\fP" +Skip checking of the discard bits in the metadata. + +.SH EXAMPLE +Analyses and repairs cache metadata on logical volume +/dev/vg/metadata: +.sp +.B cache_check /dev/vg/metadata + +The device may not be actively used by the target +when running. + +.SH DIAGNOSTICS +.B cache_check +returns an exit code of 0 for success or 1 for error. + +.SH SEE ALSO +.B cache_dump(8) +.B cache_repair(8) +.B cache_restore(8) + +.SH AUTHOR +Joe Thornber +.br +Heinz Mauelshagen diff --git a/man8/cache_dump.8 b/man8/cache_dump.8 new file mode 100644 index 0000000..a0c2924 --- /dev/null +++ b/man8/cache_dump.8 @@ -0,0 +1,59 @@ +.TH CACHE_DUMP 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +cache_dump \- dump cache metadata from device or file to standard output + +.SH SYNOPSIS +.B cache_dump +.RB [options] +.I {device|file} + +.SH DESCRIPTION +.B cache_dump +dumps binary cache metadata created by +the device-mapper cache target on a +.I device +or +.I file +to standard output for +analysis or postprocessing in XML format. +XML formated metadata can be fed into cache_restore (see +.BR cache_restore(8) ) +in order to put it back onto a metadata +.I device +(to process by the device-mapper target) or +.I file. + +.IP "\fB\-r, \-\-repair\fP". +Repair the metadata whilst dumping it. + +.IP "\fB\-h, \-\-help\fP". +Print help and exit. + +.IP "\fB\-V, \-\-version\fP". +Output version information and exit. + +.SH EXAMPLES +Dumps the cache metadata on logical volume /dev/vg/metadata +to standard output in XML format: +.sp +.B cache_dump /dev/vg/metadata + +.SH EXAMPLES +Dumps the cache metadata on logical volume /dev/vg/metadata +whilst repairing it to standard output in XML format: +.sp +.B cache_dump --repair /dev/vg/metadata + +.SH DIAGNOSTICS +.B cache_dump +returns an exit code of 0 for success or 1 for error. + +.SH SEE ALSO +.B cache_check(8) +.B cache_repair(8) +.B cache_restore(8) + +.SH AUTHOR +Joe Thornber +.br +Heinz Mauelshagen diff --git a/man8/cache_repair.8 b/man8/cache_repair.8 new file mode 100644 index 0000000..ef04a7f --- /dev/null +++ b/man8/cache_repair.8 @@ -0,0 +1,61 @@ +.TH CACHE_REPAIR 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +cache_repair \- repair cache binary metadata from device/file to device/file + +.SH SYNOPSIS +.B cache_repair +.RB [ options ] +.RB -i +.I {device|file} +.RB -o +.I {device|file} + +.SH DESCRIPTION +.B cache_repair +reads binary cache metadata created by the +respective device-mapper target from one +.I device +or +.I file +, repairs it and writes it to another +.I device +or +.I file. +If written to a metadata +.I device +, the metadata can be processed +by the device-mapper target. + +.IP "\fB\-i, \-\-input\fP \fI{device|file}\fP" +Input file or device with binary metadata. + +.IP "\fB\-o, \-\-output\fP \fI{device|file}\fP" +Output file or device for repaired binary metadata. + +.IP "\fB\-h, \-\-help\fP" +Print help and exit. + +.IP "\fB\-V, \-\-version\fP" +Output version information and exit. + +.SH EXAMPLE +Reads the binary cache metadata from file +.B metadata +, repairs it and writes it to logical volume /dev/vg/metadata +for further processing by the respective device-mapper target: +.sp +.B cache_repair -i metadata -o /dev/vg/metadata + +.SH DIAGNOSTICS +.B cache_repair +returns an exit code of 0 for success or 1 for error. + +.SH SEE ALSO +.B cache_dump(8) +.B cache_check(8) +.B cache_restore(8) + +.SH AUTHOR +Joe Thornber +.br +Heinz Mauelshagen diff --git a/man8/cache_restore.8 b/man8/cache_restore.8 new file mode 100644 index 0000000..5f9fdca --- /dev/null +++ b/man8/cache_restore.8 @@ -0,0 +1,64 @@ +.TH CACHE_RESTORE 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +cache_restore \- restore cache metadata file to device or file + +.SH SYNOPSIS +.B cache_restore +.RB [ options ] +.RB -i +.I {device|file} +.RB -o +.I {device|file} + +.SH DESCRIPTION +.B cache_restore +restores cache metadata created by the respective +device-mapper target dumped into an XML formatted (see +.BR cache_dump(8) ) +.I file +, which optionally can be preprocessed before the restore to another +.I device +or +.I file. +If restored to a metadata +.I device +, the metadata can be processed by the device-mapper target. + +.IP "\fB\-i, \-\-input\fP \fI{device|file}\fP" +Input file or device with metadata. + +.IP "\fB\-o, \-\-output\fP \fI{device|file}\fP" +Output file or device. + +.IP "\fB{\-\-debug-override-metadata-version}\fP \fI\fP" +ONLY FOR DEBUGGING PURPOSES: +.br +override the version stored in the metadata. + +.IP "\fB\-h, \-\-help\fP" +Print help and exit. + +.IP "\fB\-V, \-\-version\fP" +Output version information and exit. + +.SH EXAMPLE +Restores the XML formatted cache metadata on file +.B metadata +to logical volume /dev/vg/metadata for further processing by the +respective device-mapper target: +.sp +.B cache_restore -i metadata -o /dev/vg/metadata + +.SH DIAGNOSTICS +.B cache_restore +returns an exit code of 0 for success or 1 for error. + +.SH SEE ALSO +.B cache_dump(8) +.B cache_check(8) +.B cache_repair(8) + +.SH AUTHOR +Joe Thornber +.br +Heinz Mauelshagen From 2f00c2320c570564556ad2c269f5aa27c42e6b83 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 18 Oct 2013 16:17:06 +0200 Subject: [PATCH 7/9] Add missing cache tools manual pages and update Makefile.in respectively --- Makefile.in | 8 ++++++ man8/cache_check.8 | 62 ++++++++++++++++++++++++++++++++++++++++++ man8/cache_dump.8 | 59 ++++++++++++++++++++++++++++++++++++++++ man8/cache_repair.8 | 61 +++++++++++++++++++++++++++++++++++++++++ man8/cache_restore.8 | 64 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 254 insertions(+) create mode 100644 man8/cache_check.8 create mode 100644 man8/cache_dump.8 create mode 100644 man8/cache_repair.8 create mode 100644 man8/cache_restore.8 diff --git a/Makefile.in b/Makefile.in index e0ce06f..73326b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -299,6 +299,10 @@ distclean: clean install: $(PROGRAMS) $(INSTALL_DIR) $(BINDIR) + $(INSTALL_PROGRAM) cache_check $(BINDIR) + $(INSTALL_PROGRAM) cache_dump $(BINDIR) + $(INSTALL_PROGRAM) cache_repair $(BINDIR) + $(INSTALL_PROGRAM) cache_restore $(BINDIR) $(INSTALL_PROGRAM) thin_check $(BINDIR) $(INSTALL_PROGRAM) thin_dump $(BINDIR) $(INSTALL_PROGRAM) thin_repair $(BINDIR) @@ -306,6 +310,10 @@ install: $(PROGRAMS) $(INSTALL_PROGRAM) thin_rmap $(BINDIR) $(INSTALL_PROGRAM) thin_metadata_size $(BINDIR) $(INSTALL_DIR) $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_check.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_dump.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_repair.8 $(MANPATH)/man8 + $(INSTALL_DATA) man8/cache_restore.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_check.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_dump.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_repair.8 $(MANPATH)/man8 diff --git a/man8/cache_check.8 b/man8/cache_check.8 new file mode 100644 index 0000000..5cc7dff --- /dev/null +++ b/man8/cache_check.8 @@ -0,0 +1,62 @@ +.TH CACHE_CHECK 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +cache_check \- repair cache metadata on device or file + +.SH SYNOPSIS +.B cache_check +.RB [ options ] +.I {device|file} + +.SH DESCRIPTION +.B cache_check +checks cache metadata created by +the device-mapper cache target on a +.I device +or +.I file. + +.SH OPTIONS +.IP "\fB\-q, \-\-quiet\fP" +Suppress output messages, return only exit code. + +.IP "\fB\-h, \-\-help\fP" +Print help and exit. + +.IP "\fB\-V, \-\-version\fP" +Output version information and exit. + +.IP "\fB\-\-super\-block\-only\fP" +Only check the superblock is present. + +.IP "\fB\-\-skip-mappings\fP" +Skip checking of the block mappings which make up the bulk of the +metadata. + +.IP "\fB\-\-skip-hints\fP" +Skip checking of the policy hint values metadata. + +.IP "\fB\-\-skip-discards\fP" +Skip checking of the discard bits in the metadata. + +.SH EXAMPLE +Analyses and repairs cache metadata on logical volume +/dev/vg/metadata: +.sp +.B cache_check /dev/vg/metadata + +The device may not be actively used by the target +when running. + +.SH DIAGNOSTICS +.B cache_check +returns an exit code of 0 for success or 1 for error. + +.SH SEE ALSO +.B cache_dump(8) +.B cache_repair(8) +.B cache_restore(8) + +.SH AUTHOR +Joe Thornber +.br +Heinz Mauelshagen diff --git a/man8/cache_dump.8 b/man8/cache_dump.8 new file mode 100644 index 0000000..a0c2924 --- /dev/null +++ b/man8/cache_dump.8 @@ -0,0 +1,59 @@ +.TH CACHE_DUMP 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +cache_dump \- dump cache metadata from device or file to standard output + +.SH SYNOPSIS +.B cache_dump +.RB [options] +.I {device|file} + +.SH DESCRIPTION +.B cache_dump +dumps binary cache metadata created by +the device-mapper cache target on a +.I device +or +.I file +to standard output for +analysis or postprocessing in XML format. +XML formated metadata can be fed into cache_restore (see +.BR cache_restore(8) ) +in order to put it back onto a metadata +.I device +(to process by the device-mapper target) or +.I file. + +.IP "\fB\-r, \-\-repair\fP". +Repair the metadata whilst dumping it. + +.IP "\fB\-h, \-\-help\fP". +Print help and exit. + +.IP "\fB\-V, \-\-version\fP". +Output version information and exit. + +.SH EXAMPLES +Dumps the cache metadata on logical volume /dev/vg/metadata +to standard output in XML format: +.sp +.B cache_dump /dev/vg/metadata + +.SH EXAMPLES +Dumps the cache metadata on logical volume /dev/vg/metadata +whilst repairing it to standard output in XML format: +.sp +.B cache_dump --repair /dev/vg/metadata + +.SH DIAGNOSTICS +.B cache_dump +returns an exit code of 0 for success or 1 for error. + +.SH SEE ALSO +.B cache_check(8) +.B cache_repair(8) +.B cache_restore(8) + +.SH AUTHOR +Joe Thornber +.br +Heinz Mauelshagen diff --git a/man8/cache_repair.8 b/man8/cache_repair.8 new file mode 100644 index 0000000..ef04a7f --- /dev/null +++ b/man8/cache_repair.8 @@ -0,0 +1,61 @@ +.TH CACHE_REPAIR 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +cache_repair \- repair cache binary metadata from device/file to device/file + +.SH SYNOPSIS +.B cache_repair +.RB [ options ] +.RB -i +.I {device|file} +.RB -o +.I {device|file} + +.SH DESCRIPTION +.B cache_repair +reads binary cache metadata created by the +respective device-mapper target from one +.I device +or +.I file +, repairs it and writes it to another +.I device +or +.I file. +If written to a metadata +.I device +, the metadata can be processed +by the device-mapper target. + +.IP "\fB\-i, \-\-input\fP \fI{device|file}\fP" +Input file or device with binary metadata. + +.IP "\fB\-o, \-\-output\fP \fI{device|file}\fP" +Output file or device for repaired binary metadata. + +.IP "\fB\-h, \-\-help\fP" +Print help and exit. + +.IP "\fB\-V, \-\-version\fP" +Output version information and exit. + +.SH EXAMPLE +Reads the binary cache metadata from file +.B metadata +, repairs it and writes it to logical volume /dev/vg/metadata +for further processing by the respective device-mapper target: +.sp +.B cache_repair -i metadata -o /dev/vg/metadata + +.SH DIAGNOSTICS +.B cache_repair +returns an exit code of 0 for success or 1 for error. + +.SH SEE ALSO +.B cache_dump(8) +.B cache_check(8) +.B cache_restore(8) + +.SH AUTHOR +Joe Thornber +.br +Heinz Mauelshagen diff --git a/man8/cache_restore.8 b/man8/cache_restore.8 new file mode 100644 index 0000000..5f9fdca --- /dev/null +++ b/man8/cache_restore.8 @@ -0,0 +1,64 @@ +.TH CACHE_RESTORE 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +cache_restore \- restore cache metadata file to device or file + +.SH SYNOPSIS +.B cache_restore +.RB [ options ] +.RB -i +.I {device|file} +.RB -o +.I {device|file} + +.SH DESCRIPTION +.B cache_restore +restores cache metadata created by the respective +device-mapper target dumped into an XML formatted (see +.BR cache_dump(8) ) +.I file +, which optionally can be preprocessed before the restore to another +.I device +or +.I file. +If restored to a metadata +.I device +, the metadata can be processed by the device-mapper target. + +.IP "\fB\-i, \-\-input\fP \fI{device|file}\fP" +Input file or device with metadata. + +.IP "\fB\-o, \-\-output\fP \fI{device|file}\fP" +Output file or device. + +.IP "\fB{\-\-debug-override-metadata-version}\fP \fI\fP" +ONLY FOR DEBUGGING PURPOSES: +.br +override the version stored in the metadata. + +.IP "\fB\-h, \-\-help\fP" +Print help and exit. + +.IP "\fB\-V, \-\-version\fP" +Output version information and exit. + +.SH EXAMPLE +Restores the XML formatted cache metadata on file +.B metadata +to logical volume /dev/vg/metadata for further processing by the +respective device-mapper target: +.sp +.B cache_restore -i metadata -o /dev/vg/metadata + +.SH DIAGNOSTICS +.B cache_restore +returns an exit code of 0 for success or 1 for error. + +.SH SEE ALSO +.B cache_dump(8) +.B cache_check(8) +.B cache_repair(8) + +.SH AUTHOR +Joe Thornber +.br +Heinz Mauelshagen From dd65089b68970117ded14f816d6426b9ebef67c6 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Wed, 23 Oct 2013 11:39:31 +0100 Subject: [PATCH 8/9] sort out some #includes --- persistent-data/space-maps/disk.cc | 1 + persistent-data/space-maps/disk.h | 3 +-- unit-tests/endian_t.cc | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/persistent-data/space-maps/disk.cc b/persistent-data/space-maps/disk.cc index 9e435b6..36937ec 100644 --- a/persistent-data/space-maps/disk.cc +++ b/persistent-data/space-maps/disk.cc @@ -21,6 +21,7 @@ #include "persistent-data/space-maps/recursive.h" #include "persistent-data/space-maps/careful_alloc.h" +#include "persistent-data/data-structures/btree_checker.h" #include "persistent-data/checksum.h" #include "persistent-data/endian_utils.h" #include "persistent-data/math_utils.h" diff --git a/persistent-data/space-maps/disk.h b/persistent-data/space-maps/disk.h index 070bc44..5241419 100644 --- a/persistent-data/space-maps/disk.h +++ b/persistent-data/space-maps/disk.h @@ -19,8 +19,7 @@ #ifndef SPACE_MAP_DISK_H #define SPACE_MAP_DISK_H -// FIXME: why is btree_checker needed? -#include "persistent-data/data-structures/btree_checker.h" +#include "persistent-data/transaction_manager.h" #include "persistent-data/space_map.h" //---------------------------------------------------------------- diff --git a/unit-tests/endian_t.cc b/unit-tests/endian_t.cc index b055318..9fbbc06 100644 --- a/unit-tests/endian_t.cc +++ b/unit-tests/endian_t.cc @@ -17,10 +17,9 @@ // . #include "gmock/gmock.h" -#include "persistent-data/space-maps/disk.h" +#include "persistent-data/endian_utils.h" using namespace base; -using namespace persistent_data; using namespace std; using namespace testing; From d2b30b0eac84f75b4b4d3293211c6dc896fb4c97 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Wed, 30 Oct 2013 14:12:41 +0100 Subject: [PATCH 9/9] Fix bz#960284: thin_dump and other persistent-data tools may perform IO to misaligned buffers (on 4K hard sectored evices) --- persistent-data/buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistent-data/buffer.h b/persistent-data/buffer.h index b1a7989..527a239 100644 --- a/persistent-data/buffer.h +++ b/persistent-data/buffer.h @@ -41,7 +41,7 @@ namespace persistent_data { // guarantees. // // Alignment must be a power of two. - template + template class buffer : private boost::noncopyable { public: BOOST_STATIC_ASSERT((Alignment > 1) & !(Alignment & (Alignment - 1)));