From 5d431d72458dabb6ad43993701de25dde08d3468 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Thu, 20 Mar 2014 13:56:53 -0700 Subject: [PATCH] LU-4745 tests: Skip dry-run for OST version older than 2.5.56 Skip the dry-run testing in test_52 for OST version older than 2.5.56 Test-Parameters: alwaysuploadlogs \ envdefinitions=SLOW=yes,ENABLE_QUOTA=yes,ONLY=52 \ mdtfilesystemtype=ldiskfs mdsfilesystemtype=ldiskfs \ ostfilesystemtype=ldiskfs clientdistro=el6.6 ossdistro=el6 \ mdsdistro=el6 clientarch=x86_64 ossarch=x86_64 mdsarch=x86_64 \ ossjob=lustre-b2_5 mdsjob=lustre-b2_5 \ ossbuildno=86 mdsbuildno=86 mdtcount=1 mdssizegb=3 \ ostcount=7 ostsizegb=3 testlist=conf-sanity Change-Id: If3b45f6d29b83bce21ed40c67c5e985a8a9fd6db Signed-off-by: Wei Liu Reviewed-on: http://review.whamcloud.com/9739 Tested-by: Jenkins Reviewed-by: Jian Yu Reviewed-by: Andreas Dilger Tested-by: Maloo --- lustre/tests/conf-sanity.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index c7448da..b998906 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -3498,9 +3498,12 @@ test_52() { [ $? -eq 0 ] || { error "Unable to move objects"; return 14; } # recover objects dry-run - echo "ll_recover_lost_found_objs dry_run" - do_node $ost1node "ll_recover_lost_found_objs -n -d $ost1mnt/O" || - error "ll_recover_lost_found_objs failed" + if [ $(lustre_version_code ost1) -ge $(version_code 2.5.56) ]; then + echo "ll_recover_lost_found_objs dry_run" + do_node $ost1node \ + "ll_recover_lost_found_objs -n -d $ost1mnt/O" || + error "ll_recover_lost_found_objs failed" + fi # recover objects echo "ll_recover_lost_found_objs fix run" -- 1.8.3.1