From 5f80332f838778fb5c73be63c3ec6d52c5277326 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 12 Jul 2013 14:40:56 +0200 Subject: [PATCH 1/8] 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 927cb7a..a9f4064 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: 3%{?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 Feb 13 2013 Fedora Release Engineering - 0.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_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 4e37413bd2c476650b03959da43fda147730b367 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 2 Aug 2013 12:41:58 +0200 Subject: [PATCH 2/8] 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 a9f4064..535668f 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 f4a93731c1ab5925a5a26f9afc18e3068fcbce12 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Tue, 17 Sep 2013 16:44:41 +0200 Subject: [PATCH 3/8] 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 535668f..9e399fd 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 +* 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 - 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 e39f71926caf769283945bd57f7bb0201d09984f Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 18 Oct 2013 18:05:01 +0200 Subject: [PATCH 4/8] New upstream version 0.2.8 introducing cache_{check,dump,repair,restore} --- device-mapper-persistent-data.spec | 24 ++++++++++++++++++++---- sources | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index 9e399fd..e2f2dba 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_restore.8.gz +%{_mandir}/man8/cache_repair.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_restore +%{_sbindir}/cache_repair %{_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 From 89cc617414c423b375b29812e3ad45fcc8699be7 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 18 Oct 2013 23:30:53 +0200 Subject: [PATCH 5/8] Add man page and Makefile.in patches --- ...istent-data-0.2.8-1-missing-installs.patch | 24 ++ ...stent-data-0.2.8-1-missing-man-pages.patch | 270 ++++++++++++++++++ patch | 65 +++++ 3 files changed, 359 insertions(+) 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 create mode 100644 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/patch b/patch new file mode 100644 index 0000000..a1bf291 --- /dev/null +++ b/patch @@ -0,0 +1,65 @@ +--- device-mapper-persistent-data.spec 2013-09-17 16:44:24.539172002 +0200 ++++ ../f20/device-mapper-persistent-data.spec 2013-10-18 16:20:47.577433437 +0200 +@@ -3,23 +3,30 @@ + # + 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 + 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. +- ++ 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; 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 + echo %{version}-%{release} > VERSION + + %build +@@ -34,12 +41,20 @@ + + %files + %doc COPYING README.md ++%{_mandir}/man8/cache_check.8.gz ++%{_mandir}/man8/cache_dump.8.gz ++%{_mandir}/man8/cache_restore.8.gz ++%{_mandir}/man8/cache_repair.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_restore ++%{_sbindir}/cache_repair + %{_sbindir}/thin_check + %{_sbindir}/thin_dump + %{_sbindir}/thin_metadata_size +@@ -48,12 +63,44 @@ + %{_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} From d979765802293a28bc46f7ba497974ac660a4b97 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Wed, 28 May 2014 12:34:53 +0200 Subject: [PATCH 6/8] New upstream version 0.3.2 --- device-mapper-persistent-data.spec | 21 ++++++++++++--------- sources | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index e2f2dba..75f94df 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -1,30 +1,27 @@ # -# Copyright (C) 2011-2013 Red Hat, Inc +# Copyright (C) 2011-2014 Red Hat, Inc # -Summary: Device-mapper thin provisioning tools +Summary: Device-mapper persistent data tools Name: device-mapper-persistent-data -Version: 0.2.8 +Version: 0.3.2 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 +device-mapper-persistent-data 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. +to manage device-mapper cache metadata devices are included and +era check, dump and invalidate to support manage eras %prep %setup -q -n thin-provisioning-tools-%{version} -%patch0 -p1 -%patch1 -p1 echo %{version}-%{release} > VERSION %build @@ -53,6 +50,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/cache_dump %{_sbindir}/cache_restore %{_sbindir}/cache_repair +%{_sbindir}/era_check +%{_sbindir}/era_dump +%{_sbindir}/era_invalidate %{_sbindir}/thin_check %{_sbindir}/thin_dump %{_sbindir}/thin_metadata_size @@ -61,6 +61,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_rmap %changelog +* Wed May 28 2014 Heinz Mauelshagen - 0.3.2-1 +- New upstream version 0.3.2 introducing era_{check,dump,invalidate} + * Fri Oct 18 2013 Heinz Mauelshagen - 0.2.8-1 - New upstream version 0.2.8 introducing cache_{check,dump,repair,restore} diff --git a/sources b/sources index 0cde143..2e92956 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8799aab7032030b78439cd774f3b072 thin-provisioning-tools-v0.2.8.tar.bz2 +d739827615bdc12ddb789baef6738a1c thin-provisioning-tools-v0.3.2.tar.bz2 From 288040950b43d004f921d59fec5307bfaf6cdaa8 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Tue, 28 Oct 2014 21:26:54 +0100 Subject: [PATCH 7/8] New upstream version 0.4.1 adding tools and enhancing performance --- ...pper-persistent-data-0.4.1-bz1085620.patch | 15 +++ ...sistent-data-0.4.1-missing-man-pages.patch | 116 ++++++++++++++++++ device-mapper-persistent-data.spec | 33 +++-- sources | 2 +- 4 files changed, 156 insertions(+), 10 deletions(-) create mode 100644 device-mapper-persistent-data-0.4.1-bz1085620.patch create mode 100644 device-mapper-persistent-data-0.4.1-missing-man-pages.patch diff --git a/device-mapper-persistent-data-0.4.1-bz1085620.patch b/device-mapper-persistent-data-0.4.1-bz1085620.patch new file mode 100644 index 0000000..6fa4163 --- /dev/null +++ b/device-mapper-persistent-data-0.4.1-bz1085620.patch @@ -0,0 +1,15 @@ +--- thin-provisioning-tools-0.4.1/man8/thin_check.8.orig 2014-10-28 14:19:02.800420873 +0100 ++++ thin-provisioning-tools-0.4.1/man8/thin_check.8 2014-10-28 14:19:47.335924554 +0100 +@@ -25,6 +25,12 @@ + .IP "\fB\-V, \-\-version\fP" + Output version information and exit. + ++.IP "\fB\-\-clear\-needs\-check\-flag\fP" ++Clear the needs-check-flag in case the check of the thin pool metadata succeeded. ++If the metadata check failed, the flag is not cleared and a thin_repair run is ++needed to fix any issues. ++After thin_repair succeeded, you may run thin_check again. ++ + .IP "\fB\-\-super\-block\-only\fP" + Only check the superblock is present. + diff --git a/device-mapper-persistent-data-0.4.1-missing-man-pages.patch b/device-mapper-persistent-data-0.4.1-missing-man-pages.patch new file mode 100644 index 0000000..ac2e687 --- /dev/null +++ b/device-mapper-persistent-data-0.4.1-missing-man-pages.patch @@ -0,0 +1,116 @@ +--- thin-provisioning-tools-0.4.1/man8/era_restore.8.orig 2014-10-28 14:24:43.356272471 +0100 ++++ thin-provisioning-tools-0.4.1/man8/era_restore.8 2014-10-28 14:28:56.358133852 +0100 +@@ -0,0 +1,63 @@ ++.TH ERA_RESTORE 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- ++.SH NAME ++era_restore \- restore era metadata file to device or file ++ ++.SH SYNOPSIS ++.B era_restore ++.RB [ options ] ++.RB -i ++.I {device|file} ++.RB -o ++.I {device|file} ++ ++.SH DESCRIPTION ++.B era_restore ++restores binary era metadata created by the ++respective device-mapper target dumped into an XML formatted (see ++.BR era_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\-q, \-\-quiet\fP" ++Suppress output messages, return only exit code. ++ ++.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\-h, \-\-help\fP" ++Print help and exit. ++ ++.IP "\fB\-V, \-\-version\fP" ++Output version information and exit. ++ ++.SH EXAMPLE ++Restores the XML formatted era metadata on file ++.B metadata ++to logical volume /dev/vg/metadata for further processing by the ++respective device-mapper target: ++.sp ++.B era_restore -i metadata -o /dev/vg/metadata ++ ++.SH DIAGNOSTICS ++.B era_restore ++returns an exit code of 0 for success or 1 for error. ++ ++.SH SEE ALSO ++.B era_check(8) ++.B era_dump(8) ++.B era_invaidate(8) ++.B era_restore(8) ++ ++.SH AUTHOR ++Joe Thornber ++.br ++Heinz Mauelshagen +--- thin-provisioning-tools-0.4.1/man8/cache_metadata_size.8.orig 2014-10-28 14:31:49.116087709 +0100 ++++ thin-provisioning-tools-0.4.1/man8/cache_metadata_size.8 2014-10-28 14:50:29.337238755 +0100 +@@ -0,0 +1,47 @@ ++.TH CACHE_METADATA_SIZE 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- ++.SH NAME ++cache_metadata_size \- cache metadata device/file size calculator. ++ ++.SH SYNOPSIS ++.B cache_metadata_size ++.RB [ options ] ++ ++.SH DESCRIPTION ++.B cache_metadata_size ++calculates the size of the cache metadata based on the block size ++of the cache device and the cache block size. ++All relates to the size of the fast device (eg, SSD), rather ++than the whole cached (i.e. origin) device. ++ ++.IP "\fB\\-\-block\-size \fP ++Block size of cache in units of sectors. ++ ++.IP "\fB\\-\-device\-size \fP ++Device size of the cache device in units of sectors. ++ ++.IP "\fB\\-\-nr\-blocks \fP ++Capacity of the cache in number of blocks. ++ ++.IP "\fB\-h, \-\-help\fP" ++Print help and exit. ++ ++.IP "\fB\-V, \-\-version\fP" ++Output version information and exit. ++ ++.SH EXAMPLES ++Calculates the cache metadata device size for block size 256 sectors.and device size of 2GiB ++.sp ++.B cache_metadata_size --block-size 256 --device-size $((2*1024*1024)) ++ ++.SH DIAGNOSTICS ++.B cache_metadata_size ++returns an exit code of 0 for success or 1 for error. ++ ++.SH SEE ALSO ++.B cache_check(8) ++.B cache_dump(8) ++.B cache_repair(8) ++.B cache_restore(8) ++ ++.SH AUTHOR ++Heinz Mauelshagen diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index 75f94df..a932b51 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -1,27 +1,32 @@ # # Copyright (C) 2011-2014 Red Hat, Inc # -Summary: Device-mapper persistent data tools +Summary: Device-mapper Persistent Data Tools Name: device-mapper-persistent-data -Version: 0.3.2 +Version: 0.4.1 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 -BuildRequires: autoconf, expat-devel, libstdc++-devel, boost-devel +BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel Requires: expat +Patch0: device-mapper-persistent-data-0.4.1-bz1085620.patch +Patch1: device-mapper-persistent-data-0.4.1-missing-man-pages.patch %description -device-mapper-persistent-data contains check,dump,restore,repair,rmap +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 and -era check, dump and invalidate to support manage eras +target metadata devices; cache check,dump,metadata_size,restore +and repair tools to manage device-mapper cache metadata devices +are included and era check, dump, restore and invalidate to manage +snapshot eras %prep %setup -q -n thin-provisioning-tools-%{version} +%patch0 -p1 +%patch1 -p1 echo %{version}-%{release} > VERSION %build @@ -40,27 +45,37 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_mandir}/man8/cache_dump.8.gz %{_mandir}/man8/cache_restore.8.gz %{_mandir}/man8/cache_repair.8.gz +%{_mandir}/man8/era_check.8.gz +%{_mandir}/man8/era_dump.8.gz +%{_mandir}/man8/era_invalidate.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_repair.8.gz %{_mandir}/man8/thin_rmap.8.gz +%{_sbindir}/pdata_tools %{_sbindir}/cache_check %{_sbindir}/cache_dump +%{_sbindir}/cache_metadata_size %{_sbindir}/cache_restore %{_sbindir}/cache_repair %{_sbindir}/era_check %{_sbindir}/era_dump +%{_sbindir}/era_restore %{_sbindir}/era_invalidate %{_sbindir}/thin_check %{_sbindir}/thin_dump %{_sbindir}/thin_metadata_size -%{_sbindir}/thin_repair %{_sbindir}/thin_restore +%{_sbindir}/thin_repair %{_sbindir}/thin_rmap %changelog +* Tue Oct 28 2014 Heinz Mauelshagen - 0.4.1-1 +- New upstream version +- Manual header additions/fixes + * Wed May 28 2014 Heinz Mauelshagen - 0.3.2-1 - New upstream version 0.3.2 introducing era_{check,dump,invalidate} diff --git a/sources b/sources index 2e92956..e3c7ae7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d739827615bdc12ddb789baef6738a1c thin-provisioning-tools-v0.3.2.tar.bz2 +a1d5ac4bd865360dff6ac20ec00573cc thin-provisioning-tools-v0.4.1.tar.bz2 From 36e20e8fb3d3a1fd8040bf2e10e0a0f3697ad3d6 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Wed, 12 Nov 2014 19:03:22 +0100 Subject: [PATCH 8/8] Resolves: bz#1159466 --- device-mapper-persistent-data-0.4.1-avoid-strip.patch | 11 +++++++++++ device-mapper-persistent-data.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 device-mapper-persistent-data-0.4.1-avoid-strip.patch diff --git a/device-mapper-persistent-data-0.4.1-avoid-strip.patch b/device-mapper-persistent-data-0.4.1-avoid-strip.patch new file mode 100644 index 0000000..f7babda --- /dev/null +++ b/device-mapper-persistent-data-0.4.1-avoid-strip.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2014-11-12 18:46:30.282251378 +0100 ++++ b/Makefile.in 2014-11-12 18:46:56.108608255 +0100 +@@ -108,7 +108,7 @@ + vpath %.cc $(TOP_DIR) + + INSTALL_DIR = $(INSTALL) -m 755 -d +-INSTALL_PROGRAM = $(INSTALL) -m 755 -s ++INSTALL_PROGRAM = $(INSTALL) -m 755 + INSTALL_DATA = $(INSTALL) -p -m 644 + + ifeq ("@TESTING@", "yes") diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index a932b51..4fc4efc 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -4,7 +4,7 @@ Summary: Device-mapper Persistent Data Tools Name: device-mapper-persistent-data Version: 0.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: System Environment/Base URL: https://github.com/jthornber/thin-provisioning-tools @@ -14,6 +14,7 @@ BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel Requires: expat Patch0: device-mapper-persistent-data-0.4.1-bz1085620.patch Patch1: device-mapper-persistent-data-0.4.1-missing-man-pages.patch +Patch2: device-mapper-persistent-data-0.4.1-avoid-strip.patch %description thin-provisioning-tools contains check,dump,restore,repair,rmap @@ -27,6 +28,7 @@ snapshot eras %setup -q -n thin-provisioning-tools-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 echo %{version}-%{release} > VERSION %build @@ -72,6 +74,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_rmap %changelog +* Wed Nov 12 2014 Heinz Mauelshagen - 0.4.1-2 +- Resolves: bz#1159466 + * Tue Oct 28 2014 Heinz Mauelshagen - 0.4.1-1 - New upstream version - Manual header additions/fixes