From eb3379162c9c3044759013390cdba7b53783b31d Mon Sep 17 00:00:00 2001 From: Saurabh Tandan Date: Thu, 13 Apr 2017 11:08:44 -0700 Subject: [PATCH] LU-9318 test: sanity-lsnapshot skipped for all non-zfs configs The problem with the script was that it tried to check for ZFS file system after the script tried to add snapshot to the debug list. As part of solution the script just needs to check for ZFS file system or the version is too old at the start for of the script. Test-Parameters: trivial testlist=sanity-lsnapshot,sanity-lsnapshot,sanity-lsnapshot Signed-off-by: Saurabh Tandan Change-Id: Ie59dac7543d1e35b924c84d19c34a5ec5b903a14 Reviewed-on: https://review.whamcloud.com/26600 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Andreas Dilger --- lustre/tests/sanity-lsnapshot.sh | 7 +++++++ 1 file changed, 7 insertions(+) mode change 100644 => 100755 lustre/tests/sanity-lsnapshot.sh diff --git a/lustre/tests/sanity-lsnapshot.sh b/lustre/tests/sanity-lsnapshot.sh old mode 100644 new mode 100755 index 985cf99..bb699c2 --- a/lustre/tests/sanity-lsnapshot.sh +++ b/lustre/tests/sanity-lsnapshot.sh @@ -17,6 +17,13 @@ init_test_env $@ . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} init_logging +[[ $(lustre_version_code mds1) -lt $(version_code 2.9.55) ]] || +[[ $(lustre_version_code ost1) -lt $(version_code 2.9.55) ]] && + skip "Need server version at least 2.9.55" && exit 0 +[[ $(facet_fstype mds1) = "ldiskfs" ]] || +[[ $(facet_fstype ost1) = "ldiskfs" ]] && + skip "can't test snapshots with ldiskfs" && exit 0 + require_dsh_mds || exit 0 require_dsh_ost || exit 0 -- 1.8.3.1