Whamcloud - gitweb
LU-6675 tests: Improve error detection replay-single test 80 11/15111/2
authorJames Nunez <james.a.nunez@intel.com>
Tue, 2 Jun 2015 19:44:36 +0000 (13:44 -0600)
committerAndreas Dilger <andreas.dilger@intel.com>
Tue, 9 Jun 2015 21:03:52 +0000 (21:03 +0000)
The replay-single tests 80a - 80d call remote_dir_check_80. This
subroutine does not check the return code of 'lfs getstripe' which
results in bash errors in when checking the return of getstrip.

Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I6c7e974aff38c13afc38594327d4a11ac5efd60b
Reviewed-on: http://review.whamcloud.com/15111
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Cliff White <cliff.white@intel.com>
Reviewed-by: Justin Miller <jmiller@cray.com>
lustre/tests/replay-single.sh

index 68d88e1..eb2e96c 100755 (executable)
@@ -2127,11 +2127,16 @@ run_test 74 "Ensure applications don't fail waiting for OST recovery"
 
 remote_dir_check_80() {
        local MDTIDX=1
-       local diridx=$($GETSTRIPE -M $remote_dir)
+       local diridx
+       local fileidx
+
+       diridx=$($GETSTRIPE -M $remote_dir) ||
+               error "$GETSTRIPE -M $remote_dir failed"
        [ $diridx -eq $MDTIDX ] || error "$diridx != $MDTIDX"
 
        createmany -o $remote_dir/f-%d 20 || error "creation failed"
-       local fileidx=$($GETSTRIPE -M $remote_dir/f-1)
+       fileidx=$($GETSTRIPE -M $remote_dir/f-1) ||
+               error "$GETSTRIPE -M $remote_dir/f-1 failed"
        [ $fileidx -eq $MDTIDX ] || error "$fileidx != $MDTIDX"
 
        return 0