Updated 8.1.0.316 code

Rebased to upstream candidate.
- Resolves: rhbz#1955374
This commit is contained in:
Andrew Walsh 2021-08-09 23:53:41 +00:00
parent 0eb62182bf
commit be6fd28e55
4 changed files with 23 additions and 17 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/kvdo-36c3e1c.tar.gz
/kvdo-2e1a578.tar.gz
/kvdo-000a4c2.tar.gz
/kvdo-3f9bde5.tar.gz

View File

@ -1,7 +1,7 @@
%global commit 000a4c24afe707a30f71139a103821221b5590e8
%global commit 3f9bde55d3d6bd6083af31a11eb2ac066904f581
%global gittag 8.1.0.316
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%define spec_release 1
%define spec_release 2
%define kmod_name kvdo
%define kmod_driver_version %{gittag}
@ -17,7 +17,7 @@ Source0: https://github.com/dm-vdo/%{kmod_name}/archive/%{commit}/%{kmod_name}-%
Name: kmod-kvdo
Version: %{kmod_driver_version}
Release: %{kmod_rpm_release}%{?dist}.1
Release: %{kmod_rpm_release}%{?dist}
Summary: Kernel Modules for Virtual Data Optimizer
License: GPLv2+
URL: http://github.com/dm-vdo/kvdo
@ -152,6 +152,10 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_
rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Aut 09 2021 - Andy Walsh <awalsh@redhat.com> - 8.1.0.316-2
- Rebased to upstream candidate.
- Resolves: rhbz#1955374
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.1.0.316-1.1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688

View File

@ -1 +1 @@
SHA512 (kvdo-000a4c2.tar.gz) = 67cab52f01713e68c07cf1e847a30c4afd6078e00fbea10b69508505bf66dfe6ad7e7f0f5518d59e5b62f075a49b375914b9176e9acc28df6a5acb005703c8ea
SHA512 (kvdo-3f9bde5.tar.gz) = dfddc291a395faf6ad0c06c5e8268c58d533c0ca67cc40f263e1e60093673f5b9f102bdb8143ee11d0f1060da6d6fd9d5d42a2bfe7eba2e71cf18cccdece1bb1

View File

@ -102,16 +102,17 @@ do
;;
esac
rlPhaseStartTest "Smoke Test"
rlPhaseStartTest "LVM-VDO Smoke Test"
# Create the VDO volume and get the initial statistics
rlRun "vdo create --name=vdo1 --device=${backing_device} --verbose" 0 "Creating VDO volume vdo1"
rlRun "vdostats vdo1"
rlRun "pvcreate --config devices/scan_lvs=1 ${backing_device}"
rlRun "vgcreate --config devices/scan_lvs=1 vdo_data ${backing_device}"
rlRun "lvcreate --config devices/scan_lvs=1 --type vdo -L 9G -V 100G -n vdo0 vdo_data/vdopool"
# Create a filesystem and mount the device, check statistics
rlRun "mkfs.xfs -K /dev/mapper/vdo1" 0 "Making xfs filesystem on VDO volume"
rlRun "mount -o discard /dev/mapper/vdo1 /mnt/testmount" 0 "Mounting xfs filesystem on VDO volume"
rlRun "mkfs.xfs -K /dev/vdo_data/vdo0" 0 "Making xfs filesystem on VDO volume"
rlRun "mount -o discard /dev/vdo_data/vdo0 /mnt/testmount" 0 "Mounting xfs filesystem on VDO volume"
rlRun "df --sync /mnt/testmount"
rlRun "vdostats vdo1"
rlRun "vdostats vdo_data-vdopool-vpool"
# Copy the test data onto VDO volume 4 times to get some deduplication
for i in {1..4}
@ -119,7 +120,7 @@ do
rlRun "cp ${TmpDir}/urandom_fill_file /mnt/testmount/test_file-${i}"
done
rlRun "df --sync /mnt/testmount"
rlRun "vdostats vdo1"
rlRun "vdostats vdo_data-vdopool-vpool"
# Verify the data
for i in {1..4}
@ -129,15 +130,15 @@ do
# Unmount and stop the volume, check statistics
rlRun "umount /mnt/testmount" 0 "Unmounting testmount"
rlRun "vdostats vdo1"
rlRun "vdo stop --name=vdo1 --verbose" 0 "Stopping VDO volume vdo1"
rlRun "vdostats vdo_data-vdopool-vpool"
rlRun "lvchange --config devices/scan_lvs=1 -an vdo_data/vdo0"
# Start the VDO volume, mount it, check statistics, verify data.
rlRun "vdo start --name=vdo1 --verbose" 0 "Starting VDO volume vdo1"
rlRun "mount -o discard /dev/mapper/vdo1 /mnt/testmount" 0 "Mounting xfs filesystem on VDO volume"
rlRun "lvchange --config devices/scan_lvs=1 -ay vdo_data/vdo0"
rlRun "mount -o discard /dev/vdo_data/vdo0 /mnt/testmount" 0 "Mounting xfs filesystem on VDO volume"
rlRun "df --sync /mnt/testmount"
rlRun "vdostats vdo1"
rlRun "vdostats vdo_data-vdopool-vpool"
# Verify the data
for i in {1..4}
@ -148,7 +149,7 @@ do
rlPhaseStartCleanup
rlRun "umount /mnt/testmount" 0 "Unmounting testmount"
rlRun "vdo remove --name=vdo1 --verbose" 0 "Removing VDO volume vdo1"
rlRun "lvremove --config devices/scan_lvs=1 -ff vdo_data/vdo0" 0 "Removing VDO volume vdo0"
case $partition_type in
"lvm"*)
rlPhaseStartCleanup