Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2017-07-08 12:26:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lvm2" Sat Jul 8 12:26:34 2017 rev:106 rq:508665 version:2.02.172 Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/device-mapper.changes 2017-07-04 11:55:53.246536310 +0200 +++ /work/SRC/openSUSE:Factory/.lvm2.new/device-mapper.changes 2017-07-08 12:26:36.680366148 +0200 @@ -2 +2,7 @@ -Thu Jun 29 16:38:05 UTC 2017 - dims...@opensuse.org +Thu Jul 6 10:18:09 UTC 2017 - z...@suse.com + +- Don't create symlink for invisible device like thin-pool (bsc#1046591) + * drop 10-dm.rules-Reset-state-variable-for-spurious-events.patch + +------------------------------------------------------------------- +Tue Jul 4 10:24:40 UTC 2017 - z...@suse.com @@ -4,6 +10,9 @@ -- Add Special migration for libdevmapper's move from /lib to - /usr/lib and from device-mapper.rpm to libdevmapper.rpm: the - library is now in %{_libdir}, but up to the point where zypp - removes the 'old' device-mapper package, the old library 'wins' - the ldloader race resulting in binaries asking for the newer - version still getting the old one (boo#1045396). +- Update to LVM2.2.02.172 +- Cleanup spec file, and refresh patches + * removed device-mapper-link.patch + * removed bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch + * removed Makefile-skip-compliling-daemons-lvmlockd-directory.patch + * added bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch + +------------------------------------------------------------------- +Thu Jun 29 16:38:05 UTC 2017 - dims...@opensuse.org @@ -11,12 +20 @@ - A typical update issue seen is, zypp updating packages in this - order: - - libdevmapper1_03 (new package) - - libcryptsetup4 (links libdevmapper-1.03, rpm dep satisfied) - - systemd (linking libcryptsetup.so.4, rpm dep satisfied - At this point, anything calling systemdctl gets libdevmapper - from the old device-mapper package into the memory, which in - turn is version 1.02 and does not provide all the needed - symbols - - device-mapper (which removes /lib/libdevmapper.so.1.02, but is - now too late, as various post scripts already failed on running - systemctl) +- Fix zypper update issue with device-mapper package, see bsc#1045396 lvm2-clvm.changes: same change lvm2.changes: same change Old: ---- 10-dm.rules-Reset-state-variable-for-spurious-events.patch LVM2.2.02.170.tgz LVM2.2.02.170.tgz.asc Makefile-skip-compliling-daemons-lvmlockd-directory.patch bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch device-mapper-link.patch New: ---- LVM2.2.02.172.tgz LVM2.2.02.172.tgz.asc bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.176155152 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.180154588 +0200 @@ -19,9 +19,9 @@ %define libname libdevmapper1_03 %define libname_event libdevmapper-event1_03 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.170 -%define device_mapper_version 1.02.139 -%define thin_provisioning_version 0.5.6 +%define lvm2_version 2.02.172 +%define device_mapper_version 1.02.141 +%define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### Name: device-mapper Version: %{device_mapper_version} @@ -47,7 +47,6 @@ %{?systemd_requires} ### COMMON-PATCH-BEGIN ### # Upstream patches -Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch # SUSE patches: 1000+ for LVM # Never upstream @@ -83,31 +82,21 @@ #SUSE patches 2000+ for device mapper, udev rules #bsc#479104,bnc#707253 -Patch2000: device-mapper-dmsetup-export.patch -# no reference -Patch2001: device-mapper-gcc-warnings.patch -#bsc#724578 -Patch2002: device-mapper-link.patch +Patch2001: device-mapper-dmsetup-export.patch #bnc#78902,bnc#789019,bnc#789020 -Patch2003: udev_rules-update.diff +Patch2002: udev_rules-update.diff #bnc#875233 -Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch +Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch #bnc909358 -Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch -#bsc#932300 -Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch +Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch #bsc#940298 -Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch +Patch2005: libdm-iface-not-output-error-message-inside-retry-loop.patch #bnc#990538,bnc#986734 -Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch +Patch2006: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch #bsc#1012973 -Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch - -# 3000+ for test code -#bnc#950089 -Patch3001: lvm2-testsuite.patch -#bsc#1043040 -Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch +Patch2007: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +# no reference +Patch2008: device-mapper-gcc-warnings.patch ### COMMON-PATCH-END ### %description @@ -116,7 +105,6 @@ %prep %setup -q -n LVM2.%{lvm2_version} ### COMMON-PREP-BEGIN ### -%patch0001 -p1 %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 @@ -133,7 +121,6 @@ %patch1014 -p1 %patch1015 -p1 %patch1016 -p1 -%patch2000 -p1 %patch2001 -p1 %patch2002 -p1 %patch2003 -p1 @@ -142,9 +129,6 @@ %patch2006 -p1 %patch2007 -p1 %patch2008 -p1 -%patch2009 -p1 -%patch3001 -p1 -%patch3002 -p1 ### COMMON-PREP-END ### %build @@ -260,6 +244,7 @@ rm /%{_lib}/libdevmapper.so.1.03 fi /sbin/ldconfig + %postun -n %{libname} -p /sbin/ldconfig %package -n %{libname_event} ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.216149510 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.216149510 +0200 @@ -19,9 +19,9 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.170 -%define device_mapper_version 1.02.139 -%define thin_provisioning_version 0.5.6 +%define lvm2_version 2.02.172 +%define device_mapper_version 1.02.141 +%define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### Name: lvm2-clvm Version: %{lvm2_version} @@ -50,7 +50,6 @@ Provides: cmirrord = %{version} ### COMMON-PATCH-BEGIN ### # Upstream patches -Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch # SUSE patches: 1000+ for LVM # Never upstream @@ -86,31 +85,21 @@ #SUSE patches 2000+ for device mapper, udev rules #bsc#479104,bnc#707253 -Patch2000: device-mapper-dmsetup-export.patch -# no reference -Patch2001: device-mapper-gcc-warnings.patch -#bsc#724578 -Patch2002: device-mapper-link.patch +Patch2001: device-mapper-dmsetup-export.patch #bnc#78902,bnc#789019,bnc#789020 -Patch2003: udev_rules-update.diff +Patch2002: udev_rules-update.diff #bnc#875233 -Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch +Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch #bnc909358 -Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch -#bsc#932300 -Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch +Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch #bsc#940298 -Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch +Patch2005: libdm-iface-not-output-error-message-inside-retry-loop.patch #bnc#990538,bnc#986734 -Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch +Patch2006: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch #bsc#1012973 -Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch - -# 3000+ for test code -#bnc#950089 -Patch3001: lvm2-testsuite.patch -#bsc#1043040 -Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch +Patch2007: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +# no reference +Patch2008: device-mapper-gcc-warnings.patch ### COMMON-PATCH-END ### %description @@ -120,7 +109,6 @@ %setup -q -n LVM2.%{lvm2_version} ### COMMON-PREP-BEGIN ### -%patch0001 -p1 %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 @@ -137,7 +125,6 @@ %patch1014 -p1 %patch1015 -p1 %patch1016 -p1 -%patch2000 -p1 %patch2001 -p1 %patch2002 -p1 %patch2003 -p1 @@ -146,9 +133,6 @@ %patch2006 -p1 %patch2007 -p1 %patch2008 -p1 -%patch2009 -p1 -%patch3001 -p1 -%patch3002 -p1 ### COMMON-PREP-END ### %build @@ -165,8 +149,8 @@ --with-clvmd=corosync --with-cluster=internal --enable-cmirrord - --enable-lockd-dlm - --enable-lockd-sanlock + --enable-lvmlockd-dlm + --enable-lvmlockd-sanlock " ### COMMON-CONFIG-BEGIN ### ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.244145562 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.244145562 +0200 @@ -19,11 +19,13 @@ %define _udevdir %(pkg-config --variable=udevdir udev) %define applib liblvm2app2_2 %define cmdlib liblvm2cmd2_02 + ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.170 -%define device_mapper_version 1.02.139 -%define thin_provisioning_version 0.5.6 +%define lvm2_version 2.02.172 +%define device_mapper_version 1.02.141 +%define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### + Name: lvm2 Version: %{lvm2_version} Release: 0 @@ -53,9 +55,9 @@ Provides: lvm = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} + ### COMMON-PATCH-BEGIN ### # Upstream patches -Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch # SUSE patches: 1000+ for LVM # Never upstream @@ -91,35 +93,31 @@ #SUSE patches 2000+ for device mapper, udev rules #bsc#479104,bnc#707253 -Patch2000: device-mapper-dmsetup-export.patch -# no reference -Patch2001: device-mapper-gcc-warnings.patch -#bsc#724578 -Patch2002: device-mapper-link.patch +Patch2001: device-mapper-dmsetup-export.patch #bnc#78902,bnc#789019,bnc#789020 -Patch2003: udev_rules-update.diff +Patch2002: udev_rules-update.diff #bnc#875233 -Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch +Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch #bnc909358 -Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch -#bsc#932300 -Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch +Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch #bsc#940298 -Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch +Patch2005: libdm-iface-not-output-error-message-inside-retry-loop.patch #bnc#990538,bnc#986734 -Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch +Patch2006: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch #bsc#1012973 -Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +Patch2007: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +# no reference +Patch2008: device-mapper-gcc-warnings.patch +### COMMON-PATCH-END ### # 3000+ for test code #bnc#950089 Patch3001: lvm2-testsuite.patch #bsc#1043040 Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch -### COMMON-PATCH-END ### #bsc#1037309 -Patch4001: Makefile-skip-compliling-daemons-lvmlockd-directory.patch +Patch4001: bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch %description Programs and man pages for configuring and using the LVM2 Logical @@ -128,7 +126,6 @@ %prep %setup -q -n LVM2.%{version} ### COMMON-PREP-BEGIN ### -%patch0001 -p1 %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 @@ -145,7 +142,6 @@ %patch1014 -p1 %patch1015 -p1 %patch1016 -p1 -%patch2000 -p1 %patch2001 -p1 %patch2002 -p1 %patch2003 -p1 @@ -154,11 +150,10 @@ %patch2006 -p1 %patch2007 -p1 %patch2008 -p1 -%patch2009 -p1 -%patch3001 -p1 -%patch3002 -p1 ### COMMON-PREP-END ### +%patch3001 -p1 +%patch3002 -p1 %patch4001 -p1 %build @@ -233,25 +228,25 @@ rm %{buildroot}%{_sbindir}/dmsetup rm %{buildroot}%{_sbindir}/dmeventd rm %{buildroot}%{_sbindir}/dmstats -rm %{buildroot}%{_mandir}/man8/dmstats.8 -rm %{buildroot}%{_mandir}/man8/dmsetup.8 -rm %{buildroot}%{_mandir}/man8/dmeventd.8 rm %{buildroot}%{_udevrulesdir}/10-dm.rules rm %{buildroot}%{_udevrulesdir}/13-dm-disk.rules rm %{buildroot}%{_udevrulesdir}/95-dm-notify.rules rm %{buildroot}%{_unitdir}/dm-event.socket rm %{buildroot}%{_unitdir}/dm-event.service +# See bsc#1037309 for more info +rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service +rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service +rm %{buildroot}%{_includedir}/libdevmapper*.h rm %{buildroot}%{_libdir}/libdevmapper.so.1.03 rm %{buildroot}%{_libdir}/libdevmapper-event.so.1.03 rm %{buildroot}%{_libdir}/libdevmapper.so rm %{buildroot}%{_libdir}/libdevmapper-event.so -rm %{buildroot}%{_includedir}/libdevmapper*.h rm %{buildroot}%{_libdir}/pkgconfig/devmapper*.pc -# See bsc#1037309 for more info -rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service -rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service rm %{buildroot}%{_mandir}/man8/lvmlockctl.8 rm %{buildroot}%{_mandir}/man8/lvmlockd.8 +rm %{buildroot}%{_mandir}/man8/dmstats.8 +rm %{buildroot}%{_mandir}/man8/dmsetup.8 +rm %{buildroot}%{_mandir}/man8/dmeventd.8 # compat symlinks in /sbin remove with Leap 43 mkdir -p %{buildroot}/sbin ++++++ LVM2.2.02.170.tgz -> LVM2.2.02.172.tgz ++++++ ++++ 12513 lines of diff (skipped) ++++++ bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch ++++++ >From c0d05011007bb46232e64435e05f6f6da212655b Mon Sep 17 00:00:00 2001 From: Eric Ren <z...@suse.com> Date: Tue, 4 Jul 2017 20:11:17 +0800 Subject: [PATCH] build: skip compliling daemons/lvmlockd directory bsc#1037309 Signed-off-by: Eric Ren <z...@suse.com> --- configure | 3 ++- daemons/Makefile.in | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure b/configure index e1ae0e8..c442459 100755 --- a/configure +++ b/configure @@ -11865,7 +11865,8 @@ test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD $as_echo "$BUILD_LVMPOLLD" >&6; } ################################################################################ -BUILD_LVMLOCKD=no +# BUILD_LVMLOCKD=no +BUILD_LVMLOCKD=yes { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lvmlockdsanlock" >&5 $as_echo_n "checking whether to build lvmlockdsanlock... " >&6; } diff --git a/daemons/Makefile.in b/daemons/Makefile.in index ebbd740..58d5fef 100644 --- a/daemons/Makefile.in +++ b/daemons/Makefile.in @@ -40,9 +40,9 @@ ifeq ("@BUILD_LVMPOLLD@", "yes") SUBDIRS += lvmpolld endif -ifeq ("@BUILD_LVMLOCKD@", "yes") - SUBDIRS += lvmlockd -endif +# ifeq ("@BUILD_LVMLOCKD@", "yes") +# SUBDIRS += lvmlockd +# endif ifeq ("@BUILD_LVMDBUSD@", "yes") SUBDIRS += lvmdbusd -- 2.10.2 ++++++ device-mapper-dmsetup-export.patch ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.780069964 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.780069964 +0200 @@ -1,4 +1,4 @@ -From b148cb1c1e801455cb774f51eecd57f7e4f98c39 Mon Sep 17 00:00:00 2001 +From 74cfa0a04f51f0629093ac11fafb9c8aba881eee Mon Sep 17 00:00:00 2001 From: Eric Ren <z...@suse.com> Date: Tue, 11 Apr 2017 10:58:56 +0800 Subject: [PATCH] DM: add dmsetup export @@ -7,15 +7,15 @@ Patch-refreshed-by: Eric Ren <z...@suse.com> --- - man/dmsetup.8_main | 16 +++- - tools/dmsetup.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 266 insertions(+), 2 deletions(-) + man/dmsetup.8_main | 16 ++++++- + tools/dmsetup.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 139 insertions(+), 1 deletion(-) -Index: LVM2.2.02.169/man/dmsetup.8_main -=================================================================== ---- LVM2.2.02.169.orig/man/dmsetup.8_main -+++ LVM2.2.02.169/man/dmsetup.8_main -@@ -97,7 +97,15 @@ dmsetup \(em low level logical volume ma +diff --git a/man/dmsetup.8_main b/man/dmsetup.8_main +index 4421882..5a31f76 100644 +--- a/man/dmsetup.8_main ++++ b/man/dmsetup.8_main +@@ -97,7 +97,15 @@ dmsetup \(em low level logical volume management .. .CMD_LOAD . @@ -32,7 +32,7 @@ .B dmsetup .de CMD_LS . ad l -@@ -564,6 +572,12 @@ Specify a one-line table directly on the +@@ -564,6 +572,12 @@ Specify a one-line table directly on the command line. See below for more information on the table format. . .HP @@ -45,11 +45,11 @@ .BR --udevcookie .IR cookie .br -Index: LVM2.2.02.169/tools/dmsetup.c -=================================================================== ---- LVM2.2.02.169.orig/tools/dmsetup.c -+++ LVM2.2.02.169/tools/dmsetup.c -@@ -2231,6 +2231,129 @@ out: +diff --git a/tools/dmsetup.c b/tools/dmsetup.c +index 5c5c14c..2b0aed6 100644 +--- a/tools/dmsetup.c ++++ b/tools/dmsetup.c +@@ -2231,6 +2231,129 @@ static int _status(CMD_ARGS) return r; } @@ -179,16 +179,14 @@ /* Show target names and their version numbers */ static int _targets(CMD_ARGS) { -@@ -5904,7 +6027,11 @@ static struct command _dmsetup_commands[ +@@ -5903,6 +6026,7 @@ static struct command _dmsetup_commands[] = { {"deps", "[-o <options>] [<device>...]", 0, -1, 1, 0, _deps}, {"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats}, {"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status}, -- {"table", "[<device>...] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status}, -+ {"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps}, -+ {"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats}, -+ {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status}, + {"export", "[<device>]", 0, -1, 1, 0, _export}, -+ {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status}, + {"table", "[<device>...] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status}, {"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait}, {"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes}, - {"mangle", "[<device>...]", 0, -1, 1, 0, _mangle}, +-- +2.10.2 + ++++++ fsadm-add-support-for-btrfs.patch ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.808066015 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.808066015 +0200 @@ -1,6 +1,6 @@ -From 67a7538475e9e292103a80fed8cff8ab380314a2 Mon Sep 17 00:00:00 2001 -From: Lidong Zhong <lzh...@suse.com> -Date: Fri, 6 Mar 2015 18:35:04 +0800 +From cdb0d133b17a8c590f4b7458dbea81cdd4b4ed26 Mon Sep 17 00:00:00 2001 +From: Eric Ren <z...@suse.com> +Date: Thu, 6 Jul 2017 17:42:58 +0800 Subject: [Patch v2] fsadm: add support for btrfs Check: mount the device first and then run`btrfs filesystem scrub start @@ -12,19 +12,23 @@ --- Hi David, -This is the patch I sent to upstream. It works fine based on our test. -Please shed your light and thank you for taking time to review. + This is the patch I sent to upstream. It works fine based on our + test. + Please shed your light and thank you for taking time to review. -Regards, -Lidong + Regards, + Lidong - scripts/fsadm.sh | 104 ++++++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 88 insertions(+), 16 deletions(-) +Signed-off-by: Lidong Zhong <lzh...@suse.com> +Refreshed-by: Eric Ren <z...@suse.com> +--- + scripts/fsadm.sh | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 72 insertions(+), 4 deletions(-) -Index: LVM2.2.02.152/scripts/fsadm.sh -=================================================================== ---- LVM2.2.02.152.orig/scripts/fsadm.sh -+++ LVM2.2.02.152/scripts/fsadm.sh +diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh +index adf9b55..00ccc73 100755 +--- a/scripts/fsadm.sh ++++ b/scripts/fsadm.sh @@ -22,6 +22,7 @@ # ext2/ext3/ext4: resize2fs, tune2fs # reiserfs: resize_reiserfs, reiserfstune @@ -48,10 +52,10 @@ +FINDMNT= +UUID= +BTRFS_DEVID= - PROCMOUNTS="/proc/mounts" - PROCSELFMOUNTINFO="/proc/self/mountinfo" - NULL="$DM_DEV_DIR/null" -@@ -148,7 +153,7 @@ cleanup() { + PROCDIR="/proc" + PROCMOUNTS="$PROCDIR/mounts" + PROCSELFMOUNTINFO="$PROCDIR/self/mountinfo" +@@ -152,7 +157,7 @@ cleanup() { export _FSADM_YES _FSADM_EXTOFF unset FSADM_RUNNING test -n "$LVM_BINARY" && PATH=$_SAVEPATH @@ -60,8 +64,8 @@ fi # error exit status for break -@@ -207,6 +212,34 @@ detect_fs() { - verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\"" +@@ -225,6 +230,33 @@ detect_fs() { + verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\"." } +check_findmnt() { @@ -91,15 +95,16 @@ + + IFS=$STR_IFS +} -+ - detect_mounted_with_proc_self_mountinfo() { - MOUNTED=$("$GREP" "^[0-9]* [0-9]* $MAJORMINOR " "$PROCSELFMOUNTINFO") -@@ -243,7 +276,11 @@ detect_mounted_with_proc_mounts() { + # Check that passed mounted MAJOR:MINOR is not matching $MAJOR:MINOR of resized $VOLUME + validate_mounted_major_minor() { +@@ -348,8 +380,12 @@ detect_mounted_with_proc_mounts() { + # check if the given device is already mounted and where # FIXME: resolve swap usage and device stacking - detect_mounted() { +-detect_mounted() { - if test -e "$PROCSELFMOUNTINFO"; then ++detect_mounted() { + if test "$FSTYPE" = "btrfs" ; then + check_findmnt || error "Need 'findmnt' utility to work with btrfs filesystem" + detect_fs_uuid || verbose "Can't get fs UUID from \"$VOLUME\" volume" @@ -108,7 +113,7 @@ detect_mounted_with_proc_self_mountinfo elif test -e "$PROCMOUNTS"; then detect_mounted_with_proc_mounts -@@ -396,6 +433,31 @@ resize_xfs() { +@@ -514,6 +550,31 @@ resize_xfs() { fi } @@ -140,15 +145,15 @@ #################### # Resize filesystem #################### -@@ -412,6 +474,7 @@ resize() { +@@ -530,6 +591,7 @@ resize() { "ext3"|"ext2"|"ext4") resize_ext $NEWSIZE ;; "reiserfs") resize_reiser $NEWSIZE ;; "xfs") resize_xfs $NEWSIZE ;; + "btrfs") resize_btrfs $NEWSIZE ;; - *) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool" ;; - esac || error "Resize $FSTYPE failed" + *) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; + esac || error "Resize $FSTYPE failed." cleanup 0 -@@ -469,6 +532,12 @@ check() { +@@ -587,6 +649,12 @@ check() { # Think about better way.... dry "$XFS_REPAIR" -n -o force_geometry "$VOLUME" fi ;; @@ -161,7 +166,7 @@ *) # check if executed from interactive shell environment case "$-" in *i*) dry "$FSCK" $YES $FORCE "$VOLUME" ;; -@@ -490,7 +559,7 @@ test -n "$FSADM_RUNNING" && exit 0 +@@ -608,7 +676,7 @@ test -n "$FSADM_RUNNING" && exit 0 for i in "$TUNE_EXT" "$RESIZE_EXT" "$TUNE_REISER" "$RESIZE_REISER" \ "$TUNE_XFS" "$RESIZE_XFS" "$MOUNT" "$UMOUNT" "$MKDIR" \ "$RMDIR" "$BLOCKDEV" "$BLKID" "$GREP" "$READLINK" \ @@ -170,3 +175,6 @@ test -n "$i" || error "Required command definitions in the script are missing!" done +-- +2.10.2 + ++++++ make-mirror-legs-on-different-tag-pvs.patch ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.856059244 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.856059244 +0200 @@ -1,7 +1,7 @@ -From b17f2ae4334f9233a88d7a2fcae325f86691beb0 Mon Sep 17 00:00:00 2001 +From a83a3ec7292197bd870cae570ed545267899bc5e Mon Sep 17 00:00:00 2001 From: Eric Ren <z...@suse.com> -Date: Tue, 11 Apr 2017 10:44:30 +0800 -Subject: [PATCH] [PATCH 1/2] mirror: make mirror legs on different tag pvs +Date: Tue, 4 Jul 2017 19:42:14 +0800 +Subject: [PATCH 1/2] mirror: make mirror legs on different tag pvs The mirror legs could be placed on the PVs(with different tags) from the other mirror legs with this patch. @@ -17,7 +17,7 @@ always be placed on pvs with differnt tags. Signed-off-by: Guangliang Zhao <gz...@suse.com> -Fix-conflict-by: Eric Ren <z...@suse.com> +Refreshed-by: Eric Ren <z...@suse.com> --- conf/example.conf.in | 17 +++++++++++++++++ lib/config/config_settings.h | 5 ++++- @@ -27,7 +27,7 @@ 5 files changed, 64 insertions(+), 1 deletion(-) diff --git a/conf/example.conf.in b/conf/example.conf.in -index 614ce53..b33289f 100644 +index b5b0e6a..947a3cf 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -372,6 +372,23 @@ allocation { @@ -55,11 +55,11 @@ # Mirror logs and images will always use different PVs. # The default setting changed in version 2.02.85. diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h -index b701722..0e5a5e2 100644 +index 40b64ab..59eed26 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h -@@ -473,7 +473,10 @@ cfg(allocation_raid_stripe_all_devices_CFG, "raid_stripe_all_devices", allocatio - "when the command does not specify the number of stripes to use.\n" +@@ -474,7 +474,10 @@ cfg(allocation_raid_stripe_all_devices_CFG, "raid_stripe_all_devices", allocatio + "stripes to use.\n" "This was the default behaviour until release 2.02.162.\n") -cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL, @@ -71,10 +71,10 @@ cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 113), NULL, vsn(2, 2, 128), diff --git a/lib/config/defaults.h b/lib/config/defaults.h -index 2340636..256fab6 100644 +index d9e19d9..e5134e4 100644 --- a/lib/config/defaults.h +++ b/lib/config/defaults.h -@@ -159,6 +159,7 @@ +@@ -161,6 +161,7 @@ #define DEFAULT_MAX_LV 0 #define DEFAULT_ALLOC_POLICY ALLOC_NORMAL #define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0 @@ -83,7 +83,7 @@ #define DEFAULT_CLUSTERED 0 diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c -index 0dfbad4..357e46a 100644 +index f75cf51..8dc90b4 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -1622,6 +1622,9 @@ struct alloc_handle { @@ -157,10 +157,10 @@ if (mirrors || stripes) total_extents = new_extents; diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen -index 6663087..c385927 100644 +index 6b05147..7c1beab 100644 --- a/man/lvcreate.8_pregen +++ b/man/lvcreate.8_pregen -@@ -416,6 +416,13 @@ Create a raid10 LV. +@@ -415,6 +415,13 @@ Create a raid10 LV. [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ] .ad b .br