LU-10584 tests: sanityn test 51d cancel layout lock

Modify sanityn test 51d to cancel layout locks directly
using cancel_lru_locks.

Author: Bobi Jam <bobijam@whamcloud.com>

Test-Parameters: trivial testlist=sanityn
Test-Parameters: mdsjob=lustre-master ossjob=lustre-master serverbuildno=3807 testlist=sanityn
Signed-off-by: James Nunez <jnunez@whamcloud.com>
Change-Id: I603e99ad847d2726ff18c742db1f2d0b9f20e98b
Reviewed-on: https://review.whamcloud.com/33393
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Emoly Liu <emoly@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index a972249..28dd89c 100755 (executable)
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -2526,14 +2526,14 @@ test_51d() {
        local br=$(grep -A 10 $tfile /proc/$PID/smaps | awk '/^Rss/{print $2}')
        echo "Before revoking layout lock: $br KB mapped"
 
-       # delete the file will revoke layout lock
-       rm -f $DIR2/$tfile
+       # cancel layout lock manually
+       cancel_lru_locks mdc
 
        # rss after revoking
        local ar=$(grep -A 10 $tfile /proc/$PID/smaps | awk '/^Rss/{print $2}')
 
        kill -USR1 $PID
-       wait $PID || error
+       wait $PID || error "$MULTIOP failed"
 
        [ $ar -eq 0 ] || error "rss before: $br, after $ar, some pages remained"
 }