From e4dbccca11223b94ea8b7baf006e4cc3987841e0 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 16 Sep 2016 16:33:28 -0600 Subject: [PATCH] LU-8619 lbuild: update ZFS to use 0.6.5.8 Load zfs modules during create_zpool and import_zpool since the zfs modules are no longer autoloaded. Update lbuild to build against ZFS 0.6.5.8. Signed-off-by: Andreas Dilger Change-Id: I04082cd6cd43c98477100f9fc308666e1b3ebbe5 Reviewed-on: https://review.whamcloud.com/22571 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Nathaniel Clark Reviewed-by: Bob Glossman Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 2 +- lustre/ChangeLog | 6 +++--- lustre/tests/conf-sanity.sh | 6 ++++-- lustre/tests/test-framework.sh | 6 ++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index f4f43d5..668d909 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -884,7 +884,7 @@ build_spl_zfs() { # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the # destination for the rpms export RPM_BUILD_ROOT=$TOPDIR - SPLZFSVER=${SPLZFSVER:-0.6.5.7} + SPLZFSVER=${SPLZFSVER:-0.6.5.8} SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . diff --git a/lustre/ChangeLog b/lustre/ChangeLog index ce4ef66..761b5dc 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -57,9 +57,9 @@ TBD Intel Corporation 3.0.101-80 (SLES11 SP4) 3.12.62-60.64.8 (SLES12 SP1) vanilla linux 4.5.7 - * Recommended e2fsprogs version: 1.42.13.wc4 or newer - * Recommended ZFS / SPL version: 0.6.5.7 - * Tested with ZFS / SPL version: 0.6.5.7 + * Recommended e2fsprogs version: 1.42.13.wc5 or newer + * Recommended ZFS / SPL version: 0.6.5.8 + * Tested with ZFS / SPL version: 0.6.5.8 * NFS export disabled when stack size < 8192 (32-bit Lustre clients), since the NFSv4 export of Lustre filesystem with 4K stack may cause a stack overflow. For more information, please refer to bugzilla 17630. diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 880c918..a4be4c1 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -1749,7 +1749,8 @@ t32_test() { ! $mdt2_is_available || poolname_list+=" t32fs-mdt2" for poolname in $poolname_list; do - $r "$ZPOOL list -H $poolname >/dev/null 2>&1 || + $r "modprobe zfs; + $ZPOOL list -H $poolname >/dev/null 2>&1 || $ZPOOL import -f -d $tmp $poolname" done @@ -2274,7 +2275,8 @@ t32_test() { if [[ $fstype == zfs ]]; then local poolname=t32fs-mdt1 - $r "$ZPOOL list -H $poolname >/dev/null 2>&1 || + $r "modprobe zfs; + $ZPOOL list -H $poolname >/dev/null 2>&1 || $ZPOOL import -f -d $tmp $poolname" fi diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 9436a7c..96c242e 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1052,7 +1052,8 @@ create_zpool() { shift 3 local opts=${@:-"-o cachefile=none"} - do_facet $facet "$ZPOOL list -H $poolname >/dev/null 2>&1 || + do_facet $facet "modprobe zfs; + $ZPOOL list -H $poolname >/dev/null 2>&1 || $ZPOOL create -f $opts $poolname $vdev" } @@ -1118,7 +1119,8 @@ import_zpool() { if [[ -n "$poolname" ]]; then opts+=" -d $(dirname $(facet_vdevice $facet))" - do_facet $facet "$ZPOOL list -H $poolname >/dev/null 2>&1 || + do_facet $facet "modprobe zfs; + $ZPOOL list -H $poolname >/dev/null 2>&1 || $ZPOOL import -f $opts $poolname" fi } -- 1.8.3.1