Accepting request 558349 from Base:System
OBS-URL: https://build.opensuse.org/request/show/558349 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=112
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2de7bc1cdc
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dece83628c2c78a267a126ce6046d506582185ae5d40fb8d59b56547fccea473
|
||||
size 2371438
|
||||
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.14 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAln78m4ACgkQIoGRwVZ+LBd7JgCgrSwgbcu9Q3DcMlgQ6cKWuw7A
|
||||
OJUAn2ZLtu42YBXsqlxSbfS4/KTWBroE
|
||||
=iUwm
|
||||
-----END PGP SIGNATURE-----
|
||||
3
LVM2.2.02.177.tgz
Normal file
3
LVM2.2.02.177.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2
|
||||
size 2378651
|
||||
7
LVM2.2.02.177.tgz.asc
Normal file
7
LVM2.2.02.177.tgz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.14 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAlo4KccACgkQIoGRwVZ+LBcdSgCg3Dgs6+ItNryJV9GvCCDguOoj
|
||||
gGQAoIfvtmvZc5eif/P941hGELtZQFZ6
|
||||
=0j1r
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,39 @@
|
||||
From 6ff44e96eb804f9024bf3f606d207bd863f0e672 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Ren <zren@suse.com>
|
||||
Date: Wed, 13 Dec 2017 18:53:00 +0800
|
||||
Subject: [PATCH] test: lvmetad_dump always timed out when using nc
|
||||
|
||||
lvmetad_dump uses either "socat" or "nc" to communicate
|
||||
with lvmetad. But when using "nc" if "socat" is not
|
||||
available, nc will listen forever by default, causing the
|
||||
testcase timed out.
|
||||
|
||||
Signed-off-by: Eric Ren <zren@suse.com>
|
||||
---
|
||||
test/lib/aux.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
|
||||
index 6bc7bd47e..4603c1504 100644
|
||||
--- a/test/lib/aux.sh
|
||||
+++ b/test/lib/aux.sh
|
||||
@@ -243,14 +243,14 @@ lvmetad_talk() {
|
||||
local use=nc
|
||||
if type -p socat >& /dev/null; then
|
||||
use=socat
|
||||
- elif echo | not nc -U "$TESTDIR/lvmetad.socket" ; then
|
||||
+ elif echo | not nc -w 1 -U "$TESTDIR/lvmetad.socket" ; then
|
||||
echo "WARNING: Neither socat nor nc -U seems to be available." 1>&2
|
||||
echo "## failed to contact lvmetad."
|
||||
return 1
|
||||
fi
|
||||
|
||||
if test "$use" = nc ; then
|
||||
- nc -U "$TESTDIR/lvmetad.socket"
|
||||
+ nc -w 1 -U "$TESTDIR/lvmetad.socket"
|
||||
else
|
||||
socat "unix-connect:$TESTDIR/lvmetad.socket" -
|
||||
fi | tee -a lvmetad-talk.txt
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@ -1,3 +1,41 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 07:35:11 UTC 2017 - zren@suse.com
|
||||
|
||||
- device-mapper.spec: fix wrong replacement of DM_VERSION (bsc#1072524)
|
||||
- Fixes failure of some testcases caused by nc behavior change (bsc#1072624)
|
||||
+ bug-1072624_test-lvmetad_dump-always-timed-out-when-using-nc.patch
|
||||
- Refreshed fate-31841_fsadm-add-support-for-btrfs.patch
|
||||
- Update to LVM2.2.02.177
|
||||
When writing text metadata content, use complete 4096 byte blocks.
|
||||
Change text format metadata alignment from 512 to 4096 bytes.
|
||||
When writing metadata, consistently skip mdas marked as failed.
|
||||
Refactor and adjust text format metadata alignment calculation.
|
||||
Ensure _node_send_message always uses clean status of thin pool.
|
||||
Fix lvmlockd to use pool lock when accessing _tmeta volume.
|
||||
Report expected sanlock_convert errors only when retries fail.
|
||||
Avoid blocking in sanlock_convert on SH to EX lock conversion.
|
||||
Deactivate missing raid LV legs (_rimage_X-missing_Y_Z) on decativation.
|
||||
Categorise I/O with reason annotations in debug messages.
|
||||
Allow extending of raid LVs created with --nosync after a failed repair.
|
||||
Command will lock memory only when suspending volumes.
|
||||
Merge segments when pvmove is finished.
|
||||
Activation code for pvmove automatically discovers holding LVs for resume.
|
||||
Make a pvmove LV locking holder.
|
||||
Do not change critical section counter on resume path without real resume.
|
||||
Enhance activation code to automatically suspend pvmove participants.
|
||||
Prevent conversion of thin volumes to snapshot origin when lvmlockd is used.
|
||||
Add support for pvmove of cache and snapshot origins.
|
||||
Avoid using precommitted metadata for suspending pvmove tree.
|
||||
Deactivate activated LVs on error path when pvmove activation fails.
|
||||
Add "io" to log/debug_classes for logging low-level I/O.
|
||||
Avoid importing persistent filter in vgscan/pvscan/vgrename.
|
||||
Fix memleak of string buffer when vgcfgbackup runs in secure mode.
|
||||
Do not print error when clvmd cannot find running clvmd.
|
||||
Prevent start of new merge of snapshot if origin is already being merged.
|
||||
Fix offered type for raid6_n_6 to raid5 conversion (raid5_n).
|
||||
Deactivate sub LVs when removing unused cache-pool.
|
||||
Do not take backup with suspended devices.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 21 09:29:02 UTC 2017 - zren@suse.com
|
||||
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
%define libname libdevmapper1_03
|
||||
%define libname_event libdevmapper-event1_03
|
||||
### COMMON-DEF-BEGIN ###
|
||||
%define lvm2_version 2.02.176
|
||||
%define device_mapper_version 1.02.145
|
||||
%define lvm2_version 2.02.177
|
||||
%define device_mapper_version 1.02.146
|
||||
%define thin_provisioning_version 0.7.0
|
||||
### COMMON-DEF-END ###
|
||||
Name: device-mapper
|
||||
@ -51,15 +51,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# SUSE patches: 1000+ for LVM
|
||||
# Never upstream
|
||||
Patch1001: cmirrord_remove_date_time_from_compilation.patch
|
||||
#fate#309425
|
||||
Patch1002: fate-309425_display-dm-name-for-lv-name.patch
|
||||
#FATE#318413
|
||||
Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch
|
||||
#bsc#935623
|
||||
Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch
|
||||
|
||||
#SUSE patches 2000+ for device mapper, udev rules
|
||||
#bsc#1012973
|
||||
Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
### COMMON-PATCH-END ###
|
||||
|
||||
@ -82,7 +78,7 @@ extra_opts=""
|
||||
### COMMON-CONFIG-BEGIN ###
|
||||
export PATH=$PATH:/sbin:%{_prefix}/sbin
|
||||
# Why this messy fix here? someone released a wrong version...
|
||||
sed -ie "s/1.02.*/1.03.01/g" VERSION_DM
|
||||
sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM
|
||||
%configure \
|
||||
--enable-dmeventd \
|
||||
--enable-cmdlib \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 701999ed1d48cadb34084253c698fb9b45763499 Mon Sep 17 00:00:00 2001
|
||||
From 0e1c896caaabdf0de38466951ea281f02fe8bb77 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Ren <zren@suse.com>
|
||||
Date: Thu, 6 Jul 2017 17:42:58 +0800
|
||||
Subject: [PATCH] fsadm: add support for btrfs
|
||||
@ -13,7 +13,7 @@ filesystem
|
||||
1 file changed, 72 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
|
||||
index 4f402ce..6501e34 100755
|
||||
index a09b91534..2a29d5ad5 100755
|
||||
--- a/scripts/fsadm.sh
|
||||
+++ b/scripts/fsadm.sh
|
||||
@@ -22,6 +22,7 @@
|
||||
@ -92,7 +92,7 @@ index 4f402ce..6501e34 100755
|
||||
elif test -e "$PROCMOUNTS"; then
|
||||
detect_mounted_with_proc_mounts
|
||||
@@ -654,6 +690,32 @@ resize_crypt() {
|
||||
dry $CRYPTSETUP resize "$1" --size $CRYPT_RESIZE_BLOCKS || error "$CRYPTSETUP failed to resize device $1"
|
||||
dry "$CRYPTSETUP" resize "$1" --size $CRYPT_RESIZE_BLOCKS || error "$CRYPTSETUP failed to resize device $1"
|
||||
}
|
||||
|
||||
+########################
|
||||
@ -126,7 +126,7 @@ index 4f402ce..6501e34 100755
|
||||
####################
|
||||
@@ -676,6 +738,7 @@ resize() {
|
||||
"crypto_LUKS")
|
||||
which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume"
|
||||
which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume"
|
||||
resize_luks $NEWSIZE ;;
|
||||
+ "btrfs") resize_btrfs $NEWSIZE ;;
|
||||
*) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;
|
||||
@ -134,7 +134,7 @@ index 4f402ce..6501e34 100755
|
||||
test -z "$CRYPT_SHRINK" || resize_crypt "$VOLUME_ORIG"
|
||||
@@ -748,6 +811,12 @@ check() {
|
||||
"crypto_LUKS")
|
||||
which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required."
|
||||
which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required."
|
||||
check_luks ;;
|
||||
+ "btrfs") #mount the device first and then run scrub
|
||||
+ MOUNTPOINT=$TEMPDIR
|
||||
@ -155,5 +155,5 @@ index 4f402ce..6501e34 100755
|
||||
done
|
||||
|
||||
--
|
||||
2.10.2
|
||||
2.13.6
|
||||
|
||||
|
||||
@ -1,3 +1,41 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 07:35:11 UTC 2017 - zren@suse.com
|
||||
|
||||
- device-mapper.spec: fix wrong replacement of DM_VERSION (bsc#1072524)
|
||||
- Fixes failure of some testcases caused by nc behavior change (bsc#1072624)
|
||||
+ bug-1072624_test-lvmetad_dump-always-timed-out-when-using-nc.patch
|
||||
- Refreshed fate-31841_fsadm-add-support-for-btrfs.patch
|
||||
- Update to LVM2.2.02.177
|
||||
When writing text metadata content, use complete 4096 byte blocks.
|
||||
Change text format metadata alignment from 512 to 4096 bytes.
|
||||
When writing metadata, consistently skip mdas marked as failed.
|
||||
Refactor and adjust text format metadata alignment calculation.
|
||||
Ensure _node_send_message always uses clean status of thin pool.
|
||||
Fix lvmlockd to use pool lock when accessing _tmeta volume.
|
||||
Report expected sanlock_convert errors only when retries fail.
|
||||
Avoid blocking in sanlock_convert on SH to EX lock conversion.
|
||||
Deactivate missing raid LV legs (_rimage_X-missing_Y_Z) on decativation.
|
||||
Categorise I/O with reason annotations in debug messages.
|
||||
Allow extending of raid LVs created with --nosync after a failed repair.
|
||||
Command will lock memory only when suspending volumes.
|
||||
Merge segments when pvmove is finished.
|
||||
Activation code for pvmove automatically discovers holding LVs for resume.
|
||||
Make a pvmove LV locking holder.
|
||||
Do not change critical section counter on resume path without real resume.
|
||||
Enhance activation code to automatically suspend pvmove participants.
|
||||
Prevent conversion of thin volumes to snapshot origin when lvmlockd is used.
|
||||
Add support for pvmove of cache and snapshot origins.
|
||||
Avoid using precommitted metadata for suspending pvmove tree.
|
||||
Deactivate activated LVs on error path when pvmove activation fails.
|
||||
Add "io" to log/debug_classes for logging low-level I/O.
|
||||
Avoid importing persistent filter in vgscan/pvscan/vgrename.
|
||||
Fix memleak of string buffer when vgcfgbackup runs in secure mode.
|
||||
Do not print error when clvmd cannot find running clvmd.
|
||||
Prevent start of new merge of snapshot if origin is already being merged.
|
||||
Fix offered type for raid6_n_6 to raid5 conversion (raid5_n).
|
||||
Deactivate sub LVs when removing unused cache-pool.
|
||||
Do not take backup with suspended devices.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 21 09:29:02 UTC 2017 - zren@suse.com
|
||||
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
%define dlm_version 3.99.1
|
||||
%define sanlock_version 3.3.0
|
||||
### COMMON-DEF-BEGIN ###
|
||||
%define lvm2_version 2.02.176
|
||||
%define device_mapper_version 1.02.145
|
||||
%define lvm2_version 2.02.177
|
||||
%define device_mapper_version 1.02.146
|
||||
%define thin_provisioning_version 0.7.0
|
||||
### COMMON-DEF-END ###
|
||||
Name: lvm2-clvm
|
||||
@ -52,15 +52,11 @@ Provides: cmirrord = %{version}
|
||||
# SUSE patches: 1000+ for LVM
|
||||
# Never upstream
|
||||
Patch1001: cmirrord_remove_date_time_from_compilation.patch
|
||||
#fate#309425
|
||||
Patch1002: fate-309425_display-dm-name-for-lv-name.patch
|
||||
#FATE#318413
|
||||
Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch
|
||||
#bsc#935623
|
||||
Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch
|
||||
|
||||
#SUSE patches 2000+ for device mapper, udev rules
|
||||
#bsc#1012973
|
||||
Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
### COMMON-PATCH-END ###
|
||||
|
||||
@ -99,7 +95,7 @@ extra_opts="
|
||||
### COMMON-CONFIG-BEGIN ###
|
||||
export PATH=$PATH:/sbin:%{_prefix}/sbin
|
||||
# Why this messy fix here? someone released a wrong version...
|
||||
sed -ie "s/1.02.*/1.03.01/g" VERSION_DM
|
||||
sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM
|
||||
%configure \
|
||||
--enable-dmeventd \
|
||||
--enable-cmdlib \
|
||||
|
||||
38
lvm2.changes
38
lvm2.changes
@ -1,3 +1,41 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 07:35:11 UTC 2017 - zren@suse.com
|
||||
|
||||
- device-mapper.spec: fix wrong replacement of DM_VERSION (bsc#1072524)
|
||||
- Fixes failure of some testcases caused by nc behavior change (bsc#1072624)
|
||||
+ bug-1072624_test-lvmetad_dump-always-timed-out-when-using-nc.patch
|
||||
- Refreshed fate-31841_fsadm-add-support-for-btrfs.patch
|
||||
- Update to LVM2.2.02.177
|
||||
When writing text metadata content, use complete 4096 byte blocks.
|
||||
Change text format metadata alignment from 512 to 4096 bytes.
|
||||
When writing metadata, consistently skip mdas marked as failed.
|
||||
Refactor and adjust text format metadata alignment calculation.
|
||||
Ensure _node_send_message always uses clean status of thin pool.
|
||||
Fix lvmlockd to use pool lock when accessing _tmeta volume.
|
||||
Report expected sanlock_convert errors only when retries fail.
|
||||
Avoid blocking in sanlock_convert on SH to EX lock conversion.
|
||||
Deactivate missing raid LV legs (_rimage_X-missing_Y_Z) on decativation.
|
||||
Categorise I/O with reason annotations in debug messages.
|
||||
Allow extending of raid LVs created with --nosync after a failed repair.
|
||||
Command will lock memory only when suspending volumes.
|
||||
Merge segments when pvmove is finished.
|
||||
Activation code for pvmove automatically discovers holding LVs for resume.
|
||||
Make a pvmove LV locking holder.
|
||||
Do not change critical section counter on resume path without real resume.
|
||||
Enhance activation code to automatically suspend pvmove participants.
|
||||
Prevent conversion of thin volumes to snapshot origin when lvmlockd is used.
|
||||
Add support for pvmove of cache and snapshot origins.
|
||||
Avoid using precommitted metadata for suspending pvmove tree.
|
||||
Deactivate activated LVs on error path when pvmove activation fails.
|
||||
Add "io" to log/debug_classes for logging low-level I/O.
|
||||
Avoid importing persistent filter in vgscan/pvscan/vgrename.
|
||||
Fix memleak of string buffer when vgcfgbackup runs in secure mode.
|
||||
Do not print error when clvmd cannot find running clvmd.
|
||||
Prevent start of new merge of snapshot if origin is already being merged.
|
||||
Fix offered type for raid6_n_6 to raid5 conversion (raid5_n).
|
||||
Deactivate sub LVs when removing unused cache-pool.
|
||||
Do not take backup with suspended devices.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 21 09:29:02 UTC 2017 - zren@suse.com
|
||||
|
||||
|
||||
15
lvm2.spec
15
lvm2.spec
@ -21,8 +21,8 @@
|
||||
%define cmdlib liblvm2cmd2_02
|
||||
|
||||
### COMMON-DEF-BEGIN ###
|
||||
%define lvm2_version 2.02.176
|
||||
%define device_mapper_version 1.02.145
|
||||
%define lvm2_version 2.02.177
|
||||
%define device_mapper_version 1.02.146
|
||||
%define thin_provisioning_version 0.7.0
|
||||
### COMMON-DEF-END ###
|
||||
|
||||
@ -62,24 +62,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# SUSE patches: 1000+ for LVM
|
||||
# Never upstream
|
||||
Patch1001: cmirrord_remove_date_time_from_compilation.patch
|
||||
#fate#309425
|
||||
Patch1002: fate-309425_display-dm-name-for-lv-name.patch
|
||||
#FATE#318413
|
||||
Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch
|
||||
#bsc#935623
|
||||
Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch
|
||||
|
||||
#SUSE patches 2000+ for device mapper, udev rules
|
||||
#bsc#1012973
|
||||
Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
### COMMON-PATCH-END ###
|
||||
|
||||
# 3000+ for test code
|
||||
#bsc#1043040
|
||||
Patch3001: bug-950089_test-fix-lvm2-testsuite-build-error.patch
|
||||
Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
|
||||
Patch3003: bug-1072624_test-lvmetad_dump-always-timed-out-when-using-nc.patch
|
||||
|
||||
#bsc#1037309
|
||||
# patches specif for lvm2.spec
|
||||
Patch4001: bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch
|
||||
|
||||
%description
|
||||
@ -98,6 +94,7 @@ Volume Manager.
|
||||
|
||||
%patch3001 -p1
|
||||
%patch3002 -p1
|
||||
%patch3003 -p1
|
||||
%patch4001 -p1
|
||||
|
||||
%build
|
||||
@ -117,7 +114,7 @@ extra_opts="
|
||||
### COMMON-CONFIG-BEGIN ###
|
||||
export PATH=$PATH:/sbin:%{_prefix}/sbin
|
||||
# Why this messy fix here? someone released a wrong version...
|
||||
sed -ie "s/1.02.*/1.03.01/g" VERSION_DM
|
||||
sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM
|
||||
%configure \
|
||||
--enable-dmeventd \
|
||||
--enable-cmdlib \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user