diff --git a/.device-mapper-persistent-data.metadata b/.device-mapper-persistent-data.metadata index 0d7f7cf..7085d8d 100644 --- a/.device-mapper-persistent-data.metadata +++ b/.device-mapper-persistent-data.metadata @@ -1 +1 @@ -520da731b4d5ac3095f1b2a16b1259209fe942e2 SOURCES/thin-provisioning-tools-v0.2.8.tar.bz2 +e7482a700ebb64d64a68389fb77406afc3e1bbdd SOURCES/thin-provisioning-tools-v0.3.2.tar.bz2 diff --git a/SOURCES/device-mapper-persistent-data-0.2.8-1-missing-installs.patch b/SOURCES/device-mapper-persistent-data-0.2.8-1-missing-installs.patch deleted file mode 100644 index 59e9840..0000000 --- a/SOURCES/device-mapper-persistent-data-0.2.8-1-missing-installs.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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/SOURCES/device-mapper-persistent-data-0.2.8-1-missing-man-pages.patch b/SOURCES/device-mapper-persistent-data-0.2.8-1-missing-man-pages.patch deleted file mode 100644 index be0aaa1..0000000 --- a/SOURCES/device-mapper-persistent-data-0.2.8-1-missing-man-pages.patch +++ /dev/null @@ -1,270 +0,0 @@ -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/SOURCES/device-mapper-persistent-data-0.2.8-2-bz1022834.patch b/SOURCES/device-mapper-persistent-data-0.2.8-2-bz1022834.patch deleted file mode 100644 index 4c652e0..0000000 --- a/SOURCES/device-mapper-persistent-data-0.2.8-2-bz1022834.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- thin-provisioning-tools-0.2.8/persistent-data/buffer.h.orig -+++ thin-provisioning-tools-0.2.8/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))); diff --git a/SPECS/device-mapper-persistent-data.spec b/SPECS/device-mapper-persistent-data.spec index 0788765..850a732 100644 --- a/SPECS/device-mapper-persistent-data.spec +++ b/SPECS/device-mapper-persistent-data.spec @@ -1,18 +1,15 @@ # -# 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 -Release: 2%{?dist} +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 -Patch2: device-mapper-persistent-data-0.2.8-2-bz1022834.patch BuildRequires: autoconf, expat-devel, libstdc++-devel, boost-devel Requires: expat @@ -20,13 +17,11 @@ Requires: expat 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. +to manage device-mapper cache metadata devices are included and +era check, dump and invalidate to manage snapshot eras %prep %setup -q -n thin-provisioning-tools-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 echo %{version}-%{release} > VERSION %build @@ -55,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 @@ -63,6 +61,21 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_rmap %changelog +* Wed Apr 2 2014 Heinz Mauelshagen - 0.3.2-1 +- Resolves: #1081546 + +* Thu Mar 28 2014 Heinz Mauelshagen - 0.3.0-1 +- Resolves: #1081546 + +* Fri Feb 28 2014 Heinz Mauelshagen - 0.2.8-5 +- Resolves: #1057951 + +* Fri Jan 24 2014 Daniel Mach - 0.2.8-4 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 0.2.8-3 +- Mass rebuild 2013-12-27 + * Wed Oct 30 2013 Heinz Mauelshagen - 0.2.8-2 - Resolves: #1022834