From 34b52c0984db4c10851a6b6bbc0fbf5b53c81234 Mon Sep 17 00:00:00 2001 From: Sergey Cheremencev Date: Wed, 6 Dec 2017 14:08:21 +0300 Subject: [PATCH] LU-5637 tests: set filefrag blocksize to 1024 If blocksize for filefrag is unspecified it defaults to 1024 bytes. But for example at SL7 blocksize defaults is 4096. Set it to 1024 to have everywhere the same results. Test-Parameters: trivial envdefinitions=ONLY=130 testlist=sanity Change-Id: I550446c6c7c0b85aa769f0f8a7575a6d33b2dc4b Cray-bug-id: MRP-2933 Signed-off-by: Sergey Cheremencev Reviewed-on: https://review.whamcloud.com/30391 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Minh Diep Reviewed-by: James Nunez --- lustre/tests/sanity.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index b1b61eb..7bb1a57 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -9415,7 +9415,7 @@ test_130a() { skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return [ $RC != 0 ] && error "filefrag $fm_file failed" - filefrag_op=$(filefrag -ve $fm_file | + filefrag_op=$(filefrag -ve -k $fm_file | sed -n '/ext:/,/found/{/ext:/d; /found/d; p}') lun=$($GETSTRIPE -i $fm_file) @@ -9465,7 +9465,7 @@ test_130b() { error "dd failed on $fm_file" filefrag -ves $fm_file || error "filefrag $fm_file failed" - filefrag_op=$(filefrag -ve $fm_file | + filefrag_op=$(filefrag -ve -k $fm_file | sed -n '/ext:/,/found/{/ext:/d; /found/d; p}') last_lun=$(echo $filefrag_op | cut -d: -f5 | @@ -9524,7 +9524,7 @@ test_130c() { error "dd failed on $fm_file" filefrag -ves $fm_file || error "filefrag $fm_file failed" - filefrag_op=$(filefrag -ve $fm_file | + filefrag_op=$(filefrag -ve -k $fm_file | sed -n '/ext:/,/found/{/ext:/d; /found/d; p}') last_lun=$(echo $filefrag_op | cut -d: -f5 | @@ -9592,7 +9592,7 @@ test_130d() { error "dd failed on $fm_file" filefrag -ves $fm_file || error "filefrag $fm_file failed" - filefrag_op=$(filefrag -ve $fm_file | + filefrag_op=$(filefrag -ve -k $fm_file | sed -n '/ext:/,/found/{/ext:/d; /found/d; p}') last_lun=$(echo $filefrag_op | cut -d: -f5 | @@ -9654,7 +9654,7 @@ test_130e() { done filefrag -ves $fm_file || error "filefrag $fm_file failed" - filefrag_op=$(filefrag -ve $fm_file | + filefrag_op=$(filefrag -ve -k $fm_file | sed -n '/ext:/,/found/{/ext:/d; /found/d; p}') last_lun=$(echo $filefrag_op | cut -d: -f5 | -- 1.8.3.1