From 2c53d2524db409b8b0d2afc223850efe5951d360 Mon Sep 17 00:00:00 2001 From: basebuilder_pel7x64builder0 Date: Wed, 6 Jun 2018 09:48:08 +0200 Subject: [PATCH] device-mapper-persistent-data package update Signed-off-by: basebuilder_pel7x64builder0 --- ...e-mapper-persistent-data-avoid-strip.patch | 14 +++-- ...t-data-cache_restore-v2-dirty-bitset.patch | 15 ++++++ SPECS/device-mapper-persistent-data.spec | 51 ++++++++++--------- 3 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 SOURCES/device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch diff --git a/SOURCES/device-mapper-persistent-data-avoid-strip.patch b/SOURCES/device-mapper-persistent-data-avoid-strip.patch index 3b7379ae..6b3410e1 100644 --- a/SOURCES/device-mapper-persistent-data-avoid-strip.patch +++ b/SOURCES/device-mapper-persistent-data-avoid-strip.patch @@ -1,8 +1,12 @@ -diff -purN thin-provisioning-tools-0.6.0.orig/Makefile.in thin-provisioning-tools-0.6.0.new/Makefile.in ---- thin-provisioning-tools-0.6.0.orig/Makefile.in 2016-01-20 16:43:21.000000000 +0100 -+++ thin-provisioning-tools-0.6.0.new/Makefile.in 2016-01-20 17:26:11.943664295 +0100 -@@ -174,7 +174,6 @@ distclean: clean - install: bin/pdata_tools + Makefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 0aa9401..0f4f7cb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -262,7 +262,6 @@ MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS)) + install: bin/pdata_tools $(MANPAGES) $(INSTALL_DIR) $(BINDIR) $(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR) - $(STRIP) $(BINDIR)/pdata_tools diff --git a/SOURCES/device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch b/SOURCES/device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch new file mode 100644 index 00000000..bf1c91cd --- /dev/null +++ b/SOURCES/device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch @@ -0,0 +1,15 @@ +diff --git a/caching/metadata.cc b/caching/metadata.cc +index 91806f4..7b150be 100644 +--- a/caching/metadata.cc ++++ b/caching/metadata.cc +@@ -128,6 +128,10 @@ void + metadata::commit_mappings() + { + sb_.mapping_root = mappings_->get_root(); ++ if (sb_.version >= 2) { ++ dirty_bits_->flush(); ++ sb_.dirty_root = dirty_bits_->get_root(); ++ } + } + + void diff --git a/SPECS/device-mapper-persistent-data.spec b/SPECS/device-mapper-persistent-data.spec index 91d4ef5a..d3218243 100644 --- a/SPECS/device-mapper-persistent-data.spec +++ b/SPECS/device-mapper-persistent-data.spec @@ -2,25 +2,17 @@ # Copyright (C) 2011-2017 Red Hat, Inc # -%define pre_release_upstream -rc6 -%define pre_release rc6 - Summary: Device-mapper Persistent Data Tools Name: device-mapper-persistent-data -Version: 0.7.0 -Release: 0.1.%{pre_release}%{?dist}.1 +Version: 0.7.3 +Release: 3%{?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-%{version}%{pre_release_upstream}.tar.gz -# Source1: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz -Patch0: device-mapper-persistent-data-document-clear-needs-check-flag.patch -Patch1: device-mapper-persistent-data-add-era_restore-and-cache_metadata_size-man-pages.patch -Patch2: device-mapper-persistent-data-avoid-strip.patch -# Commit: 4da8d19f296a9 -Patch3: device-mapper-persistent-data-cache_restore-fix-metadata-version-and-clean-shutdown.patch -# Commit: e3b7d825696c2 -Patch4: device-mapper-persistent-data-cache_restore-v2-dirty-bitset-root-not-written.patch +#Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-% {version}.tar.gz +Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz +Patch0: device-mapper-persistent-data-avoid-strip.patch +Patch1: device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel Requires: expat @@ -34,12 +26,9 @@ are included and era check, dump, restore and invalidate to manage snapshot eras %prep -%setup -q -n thin-provisioning-tools-%{version}%{pre_release_upstream} -%patch0 -p1 -b .clear_needs_check_flag -%patch1 -p1 -b .man_pages -%patch2 -p1 -b .avoid_strip -%patch3 -p1 -b .fix_flags -%patch4 -p1 -b .v2_dirty_bitset_root +%setup -q -n thin-provisioning-tools-%{version} +%patch0 -p1 -b .avoid_strip +%patch1 -p1 -b .v2_dirty_bitset echo %{version}-%{release} > VERSION %build @@ -56,12 +45,14 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %doc COPYING README.md %{_mandir}/man8/cache_check.8.gz %{_mandir}/man8/cache_dump.8.gz +%{_mandir}/man8/cache_metadata_size.8.gz %{_mandir}/man8/cache_repair.8.gz %{_mandir}/man8/cache_restore.8.gz %{_mandir}/man8/cache_writeback.8.gz %{_mandir}/man8/era_check.8.gz %{_mandir}/man8/era_dump.8.gz %{_mandir}/man8/era_invalidate.8.gz +%{_mandir}/man8/era_restore.8.gz %{_mandir}/man8/thin_check.8.gz %{_mandir}/man8/thin_delta.8.gz %{_mandir}/man8/thin_dump.8.gz @@ -91,11 +82,25 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_restore %{_sbindir}/thin_rmap %{_sbindir}/thin_trim -%{_sbindir}/thin_show_duplicates %changelog -* Mon Nov 20 2017 Marian Csontos - 0.7.0-0.1-rc6.el7_4.1 -- Fix v2 metadata corruption in cache_restore. +* Tue Nov 14 2017 Marian Csontos - 0.7.3-3 +- Fix version 2 metadata corruption in cache_restore. + +* Tue Oct 10 2017 Marian Csontos - 0.7.3-2 +- Rebuilding with updated source tarball. + +* Fri Oct 06 2017 Marian Csontos - 0.7.3-1 +- Update to latest bugfix and documentation update release. +- *_restore tools wipe superblock as a last resort. +- Add thin_check --override-mapping-root. + +* Fri Sep 22 2017 Marian Csontos - 0.7.2-1 +- Update to latest upstream release including various bug fixes and new features. +- Fix segfault when dump tools are given a tiny metadata file. +- Fix -V exiting with 1. +- Fix thin_check when running on XML dump instead of binary data. +- Speed up free block searches. * Mon Mar 27 2017 Peter Rajnoha - 0.7.0-0.1-rc6 - Don't open devices as writeable if --clear-needs-check-flag is not set.