From 1bc91ec275f6b2921e78a66bcdb30b8b52c31b89 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 12 Jul 2013 14:45:25 +0200 Subject: [PATCH 1/5] New upstream version v0.2.1 --- .gitignore | 1 + device-mapper-persistent-data.spec | 25 ++++++++++++++++--------- sources | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4e74606..68d35b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /thin-provisioning-tools-v0.1.4.tar.bz2 +/thin-provisioning-tools-v0.2.1.tar.bz2 diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index 6f1d9f4..ced8330 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -1,26 +1,28 @@ # -# Copyright (C) 2011-2012 Red Hat, Inc +# Copyright (C) 2011-2013 Red Hat, Inc # Summary: Device-mapper thin provisioning tools Name: device-mapper-persistent-data -Version: 0.1.4 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Base URL: https://github.com/jthornber/thin-provisioning-tools -Source0: https://github.com/downloads/jthornber/thin-provisioning-tools/thin-provisioning-tools-v%{version}.tar.bz2 -BuildRequires: expat-devel, libstdc++-devel, boost-devel +Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-v%{version}.tar.bz2 +# Source1: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz +BuildRequires: autoconf, expat-devel, libstdc++-devel, boost-devel Requires: expat %description -thin-provisioning-tools contains dump,restore and repair tools to +thin-provisioning-tools contains check,dump,restore,repair and rmap tools to manage device-mapper thin provisioning target metadata devices. %prep -%setup -q -n thin-provisioning-tools-v%{version} +%setup -q -n thin-provisioning-tools-%{version} %build -%configure --enable-debug --enable-testing +autoconf +%configure make %{?_smp_mflags} %install @@ -29,15 +31,20 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %clean %files -%doc COPYING README +%doc COPYING README.md %{_mandir}/man8/thin_dump.8.gz %{_mandir}/man8/thin_check.8.gz %{_mandir}/man8/thin_restore.8.gz %{_sbindir}/thin_dump %{_sbindir}/thin_check +%{_sbindir}/thin_repair %{_sbindir}/thin_restore +%{_sbindir}/thin_rmap %changelog +* Fri Jul 12 2013 Heinz Mauelshagen - 0.2.1-1 +- New upstream version. + * Wed Jul 18 2012 Fedora Release Engineering - 0.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index f94f3db..5a86374 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df5b067d5e4aa82a0cdf9f16783d16b8 thin-provisioning-tools-v0.1.4.tar.bz2 +122bd4414f9afdf893be2fc3d3355bb4 thin-provisioning-tools-v0.2.1.tar.bz2 From 32c4283121fa1cba07c03091558927a3a49c4828 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 2 Aug 2013 12:49:24 +0200 Subject: [PATCH 2/5] New upstrem version 0.2.3 --- device-mapper-persistent-data.spec | 23 ++++++++++++++++------- sources | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index ced8330..47daae1 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -3,7 +3,7 @@ # Summary: Device-mapper thin provisioning tools Name: device-mapper-persistent-data -Version: 0.2.1 +Version: 0.2.3 Release: 1%{?dist} License: GPLv3+ Group: System Environment/Base @@ -14,16 +14,18 @@ BuildRequires: autoconf, expat-devel, libstdc++-devel, boost-devel Requires: expat %description -thin-provisioning-tools contains check,dump,restore,repair and rmap tools to -manage device-mapper thin provisioning target metadata devices. +thin-provisioning-tools contains check,dump,restore,repair,rmap and metadata_size +tools to manage device-mapper thin provisioning target metadata devices or +metadata on files. %prep %setup -q -n thin-provisioning-tools-%{version} +echo %{version}-%{release} > VERSION %build autoconf -%configure -make %{?_smp_mflags} +%configure --with-optimisation= +make %{?_smp_mflags} V= %install make DESTDIR=%{buildroot} MANDIR=%{_mandir} install @@ -32,16 +34,23 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %files %doc COPYING README.md -%{_mandir}/man8/thin_dump.8.gz %{_mandir}/man8/thin_check.8.gz +%{_mandir}/man8/thin_dump.8.gz +%{_mandir}/man8/thin_metadata_size.8.gz +%{_mandir}/man8/thin_repair.8.gz %{_mandir}/man8/thin_restore.8.gz -%{_sbindir}/thin_dump +%{_mandir}/man8/thin_rmap.8.gz %{_sbindir}/thin_check +%{_sbindir}/thin_dump +%{_sbindir}/thin_metadata_size %{_sbindir}/thin_repair %{_sbindir}/thin_restore %{_sbindir}/thin_rmap %changelog +* Wed Jul 31 2013 Heinz Mauelshagen - 0.2.3-1 +- New upstream version + * Fri Jul 12 2013 Heinz Mauelshagen - 0.2.1-1 - New upstream version. diff --git a/sources b/sources index 5a86374..16273bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -122bd4414f9afdf893be2fc3d3355bb4 thin-provisioning-tools-v0.2.1.tar.bz2 +3ed92934d518c69ab724cc6e165a5706 thin-provisioning-tools-v0.2.3.tar.bz2 From 7d0573b8dfbedd61f01c555dd3155be3b6bc72d2 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Tue, 17 Sep 2013 16:46:20 +0200 Subject: [PATCH 3/5] New upstream version 0.2.7 --- device-mapper-persistent-data.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index 47daae1..f741802 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -3,7 +3,7 @@ # Summary: Device-mapper thin provisioning tools Name: device-mapper-persistent-data -Version: 0.2.3 +Version: 0.2.7 Release: 1%{?dist} License: GPLv3+ Group: System Environment/Base @@ -48,6 +48,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_rmap %changelog +* Wed Jul 31 2013 Heinz Mauelshagen - 0.2.7-1 +- New upstream version 0.2.7 + * Wed Jul 31 2013 Heinz Mauelshagen - 0.2.3-1 - New upstream version diff --git a/sources b/sources index 16273bb..656f2a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ed92934d518c69ab724cc6e165a5706 thin-provisioning-tools-v0.2.3.tar.bz2 +7c9573504efa2723ff442c4f9af80172 thin-provisioning-tools-v0.2.7.tar.bz2 From c42cbdeafe839108b46294b6f0fcef669ddbc7c1 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Tue, 17 Sep 2013 16:47:42 +0200 Subject: [PATCH 4/5] New upstream version 0.2.7 --- device-mapper-persistent-data.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index f741802..78c314a 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -48,7 +48,7 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_rmap %changelog -* Wed Jul 31 2013 Heinz Mauelshagen - 0.2.7-1 +* Tue Sep 17 2013 Heinz Mauelshagen - 0.2.7-1 - New upstream version 0.2.7 * Wed Jul 31 2013 Heinz Mauelshagen - 0.2.3-1 From d6497f6c5904526a5ba0035586cf0b40086e2230 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 18 Oct 2013 18:05:37 +0200 Subject: [PATCH 5/5] New upstream version 0.2.8 introducing cache_{check,dump,repair,restore} --- ...istent-data-0.2.8-1-missing-installs.patch | 24 ++ ...stent-data-0.2.8-1-missing-man-pages.patch | 270 ++++++++++++++++++ device-mapper-persistent-data.spec | 24 +- sources | 2 +- 4 files changed, 315 insertions(+), 5 deletions(-) create mode 100644 device-mapper-persistent-data-0.2.8-1-missing-installs.patch create mode 100644 device-mapper-persistent-data-0.2.8-1-missing-man-pages.patch diff --git a/device-mapper-persistent-data-0.2.8-1-missing-installs.patch b/device-mapper-persistent-data-0.2.8-1-missing-installs.patch new file mode 100644 index 0000000..59e9840 --- /dev/null +++ b/device-mapper-persistent-data-0.2.8-1-missing-installs.patch @@ -0,0 +1,24 @@ +--- thin-provisioning-tools-0.2.8/Makefile.in.orig 2013-10-18 17:11:34.320772851 +0200 ++++ thin-provisioning-tools-0.2.8/Makefile.in 2013-10-18 17:11:09.938219484 +0200 +@@ -299,6 +299,10 @@ + + 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_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/device-mapper-persistent-data-0.2.8-1-missing-man-pages.patch b/device-mapper-persistent-data-0.2.8-1-missing-man-pages.patch new file mode 100644 index 0000000..be0aaa1 --- /dev/null +++ b/device-mapper-persistent-data-0.2.8-1-missing-man-pages.patch @@ -0,0 +1,270 @@ +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 diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index 78c314a..030299a 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -3,23 +3,28 @@ # Summary: Device-mapper thin provisioning tools Name: device-mapper-persistent-data -Version: 0.2.7 +Version: 0.2.8 Release: 1%{?dist} License: GPLv3+ Group: System Environment/Base URL: https://github.com/jthornber/thin-provisioning-tools Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-v%{version}.tar.bz2 # Source1: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz +Patch0: device-mapper-persistent-data-0.2.8-1-missing-man-pages.patch +Patch1: device-mapper-persistent-data-0.2.8-1-missing-installs.patch BuildRequires: autoconf, expat-devel, libstdc++-devel, boost-devel Requires: expat %description -thin-provisioning-tools contains check,dump,restore,repair,rmap and metadata_size -tools to manage device-mapper thin provisioning target metadata devices or -metadata on files. +thin-provisioning-tools contains check,dump,restore,repair,rmap +and metadata_size tools to manage device-mapper thin provisioning +target metadata devices; cache check,dump,restore and repair tools +to manage device-mapper cache metadata devices are included. %prep %setup -q -n thin-provisioning-tools-%{version} +%patch0 -p1 +%patch1 -p1 echo %{version}-%{release} > VERSION %build @@ -34,12 +39,20 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %files %doc COPYING README.md +%{_mandir}/man8/cache_check.8.gz +%{_mandir}/man8/cache_dump.8.gz +%{_mandir}/man8/cache_repair.8.gz +%{_mandir}/man8/cache_restore.8.gz %{_mandir}/man8/thin_check.8.gz %{_mandir}/man8/thin_dump.8.gz %{_mandir}/man8/thin_metadata_size.8.gz %{_mandir}/man8/thin_repair.8.gz %{_mandir}/man8/thin_restore.8.gz %{_mandir}/man8/thin_rmap.8.gz +%{_sbindir}/cache_check +%{_sbindir}/cache_dump +%{_sbindir}/cache_repair +%{_sbindir}/cache_restore %{_sbindir}/thin_check %{_sbindir}/thin_dump %{_sbindir}/thin_metadata_size @@ -48,6 +61,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_rmap %changelog +* Fri Oct 18 2013 Heinz Mauelshagen - 0.2.8-1 +- New upstream version 0.2.8 introducing cache_{check,dump,repair,restore} + * Tue Sep 17 2013 Heinz Mauelshagen - 0.2.7-1 - New upstream version 0.2.7 diff --git a/sources b/sources index 656f2a2..0cde143 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c9573504efa2723ff442c4f9af80172 thin-provisioning-tools-v0.2.7.tar.bz2 +c8799aab7032030b78439cd774f3b072 thin-provisioning-tools-v0.2.8.tar.bz2