From 26a7abe812834663a6d42ba0d04606650c71cb9f Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Fri, 10 May 2019 16:34:36 -0400 Subject: [PATCH] LU-10754 tests: Clear mdc locks before tests On ZFS testing, a sync stemming from a lock cancellation from a previous test sometimes causes us to run longer than the sleep times allowed for forked processes to be ready. So, cancel the MDC lru locks first. This will only incur a sync if there is data to sync, but will wait for one if necessary. Test-Parameters: testlist=sanityn,sanityn,sanityn,sanityn Signed-off-by: Patrick Farrell Change-Id: I865de238aadd6da719066e6f22e2a36d1d3f368e Reviewed-on: https://review.whamcloud.com/34848 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Alex Zhuravlev Reviewed-by: Oleg Drokin --- lustre/tests/sanityn.sh | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index e22911a..d59d426 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -1488,6 +1488,7 @@ check_pdo_conflict() { # test 40: check non-blocking operations test_40a() { remote_mds_nodsh && skip "remote MDS with nodsh" && return + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 touch $DIR2 @@ -1518,6 +1519,7 @@ run_test 40a "pdirops: create vs others ==============" test_40b() { remote_mds_nodsh && skip "remote MDS with nodsh" && return + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 touch $DIR1/$tfile & @@ -1548,6 +1550,7 @@ run_test 40b "pdirops: open|create and others ==============" test_40c() { remote_mds_nodsh && skip "remote MDS with nodsh" && return + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1579,6 +1582,7 @@ run_test 40c "pdirops: link and others ==============" test_40d() { remote_mds_nodsh && skip "remote MDS with nodsh" && return + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1609,6 +1613,7 @@ run_test 40d "pdirops: unlink and others ==============" test_40e() { remote_mds_nodsh && skip "remote MDS with nodsh" && return + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1638,6 +1643,7 @@ run_test 40e "pdirops: rename and others ==============" # test 41: create blocking operations test_41a() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c & @@ -1653,6 +1659,7 @@ test_41a() { run_test 41a "pdirops: create vs mkdir ==============" test_41b() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c & @@ -1668,6 +1675,7 @@ test_41b() { run_test 41b "pdirops: create vs create ==============" test_41c() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1684,6 +1692,7 @@ test_41c() { run_test 41c "pdirops: create vs link ==============" test_41d() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c & @@ -1699,6 +1708,7 @@ test_41d() { run_test 41d "pdirops: create vs unlink ==============" test_41e() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1715,6 +1725,7 @@ test_41e() { run_test 41e "pdirops: create and rename (tgt) ==============" test_41f() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c & @@ -1730,6 +1741,7 @@ test_41f() { run_test 41f "pdirops: create and rename (src) ==============" test_41g() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c & @@ -1745,6 +1757,7 @@ test_41g() { run_test 41g "pdirops: create vs getattr ==============" test_41h() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c & @@ -1761,6 +1774,7 @@ run_test 41h "pdirops: create vs readdir ==============" # test 42: unlink and blocking operations test_42a() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 mkdir $DIR1/$tfile & @@ -1776,6 +1790,7 @@ test_42a() { run_test 42a "pdirops: mkdir vs mkdir ==============" test_42b() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 mkdir $DIR1/$tfile & @@ -1791,6 +1806,7 @@ test_42b() { run_test 42b "pdirops: mkdir vs create ==============" test_42c() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1807,6 +1823,7 @@ test_42c() { run_test 42c "pdirops: mkdir vs link ==============" test_42d() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 mkdir $DIR1/$tfile & @@ -1822,6 +1839,7 @@ test_42d() { run_test 42d "pdirops: mkdir vs unlink ==============" test_42e() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1838,6 +1856,7 @@ test_42e() { run_test 42e "pdirops: mkdir and rename (tgt) ==============" test_42f() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 mkdir $DIR1/$tfile & @@ -1853,6 +1872,7 @@ test_42f() { run_test 42f "pdirops: mkdir and rename (src) ==============" test_42g() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 mkdir $DIR1/$tfile & @@ -1868,6 +1888,7 @@ test_42g() { run_test 42g "pdirops: mkdir vs getattr ==============" test_42h() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 mkdir $DIR1/$tfile & @@ -1884,6 +1905,7 @@ run_test 42h "pdirops: mkdir vs readdir ==============" # test 43: unlink and blocking operations test_43a() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1900,6 +1922,7 @@ test_43a() { run_test 43a "pdirops: unlink vs mkdir ==============" test_43b() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1916,6 +1939,7 @@ test_43b() { run_test 43b "pdirops: unlink vs create ==============" test_43c() { + cancel_lru_locks mdc touch $DIR1/$tfile touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 @@ -1933,6 +1957,7 @@ test_43c() { run_test 43c "pdirops: unlink vs link ==============" test_43d() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1949,6 +1974,7 @@ test_43d() { run_test 43d "pdirops: unlink vs unlink ==============" test_43e() { + cancel_lru_locks mdc touch $DIR1/$tfile touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 @@ -1966,6 +1992,7 @@ test_43e() { run_test 43e "pdirops: unlink and rename (tgt) ==============" test_43f() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1982,6 +2009,7 @@ test_43f() { run_test 43f "pdirops: unlink and rename (src) ==============" test_43g() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1998,6 +2026,7 @@ test_43g() { run_test 43g "pdirops: unlink vs getattr ==============" test_43h() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2015,6 +2044,7 @@ run_test 43h "pdirops: unlink vs readdir ==============" test_43i() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2033,6 +2063,7 @@ run_test 43i "pdirops: unlink vs remote mkdir" # test 44: rename tgt and blocking operations test_44a() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2 0x146 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146 @@ -2050,6 +2081,7 @@ test_44a() { run_test 44a "pdirops: rename tgt vs mkdir ==============" test_44b() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2 0x146 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146 @@ -2066,6 +2098,7 @@ test_44b() { run_test 44b "pdirops: rename tgt vs create ==============" test_44c() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 touch $DIR1/$tfile-3 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2 0x146 @@ -2083,6 +2116,7 @@ test_44c() { run_test 44c "pdirops: rename tgt vs link ==============" test_44d() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2 0x146 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146 @@ -2099,6 +2133,7 @@ test_44d() { run_test 44d "pdirops: rename tgt vs unlink ==============" test_44e() { + cancel_lru_locks mdc touch $DIR1/$tfile touch $DIR1/$tfile-2 touch $DIR1/$tfile-3 @@ -2117,6 +2152,7 @@ test_44e() { run_test 44e "pdirops: rename tgt and rename (tgt) ==============" test_44f() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 touch $DIR1/$tfile-3 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2 0x146 @@ -2134,6 +2170,7 @@ test_44f() { run_test 44f "pdirops: rename tgt and rename (src) ==============" test_44g() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2 0x146 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146 @@ -2150,6 +2187,7 @@ test_44g() { run_test 44g "pdirops: rename tgt vs getattr ==============" test_44h() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2 0x146 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146 @@ -2168,6 +2206,7 @@ run_test 44h "pdirops: rename tgt vs readdir ==============" # test 44: rename tgt and blocking operations test_44i() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2 0x146 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146 @@ -2186,6 +2225,7 @@ run_test 44i "pdirops: rename tgt vs remote mkdir" # test 45: rename src and blocking operations test_45a() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2202,6 +2242,7 @@ test_45a() { run_test 45a "pdirops: rename src vs mkdir ==============" test_45b() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2218,6 +2259,7 @@ test_45b() { run_test 45b "pdirops: rename src vs create ==============" test_45c() { + cancel_lru_locks mdc touch $DIR1/$tfile touch $DIR1/$tfile-3 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 @@ -2235,6 +2277,7 @@ test_45c() { run_test 45c "pdirops: rename src vs link ==============" test_45d() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2251,6 +2294,7 @@ test_45d() { run_test 45d "pdirops: rename src vs unlink ==============" test_45e() { + cancel_lru_locks mdc touch $DIR1/$tfile touch $DIR1/$tfile-3 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 @@ -2268,6 +2312,7 @@ test_45e() { run_test 45e "pdirops: rename src and rename (tgt) ==============" test_45f() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2284,6 +2329,7 @@ test_45f() { run_test 45f "pdirops: rename src and rename (src) ==============" test_45g() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2300,6 +2346,7 @@ test_45g() { run_test 45g "pdirops: rename src vs getattr ==============" test_45h() { + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2316,6 +2363,7 @@ run_test 45h "pdirops: unlink vs readdir ==============" test_45i() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2334,6 +2382,7 @@ run_test 45i "pdirops: rename src vs remote mkdir" # test 46: link and blocking operations test_46a() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2350,6 +2399,7 @@ test_46a() { run_test 46a "pdirops: link vs mkdir ==============" test_46b() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2366,6 +2416,7 @@ test_46b() { run_test 46b "pdirops: link vs create ==============" test_46c() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2382,6 +2433,7 @@ test_46c() { run_test 46c "pdirops: link vs link ==============" test_46d() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2398,6 +2450,7 @@ test_46d() { run_test 46d "pdirops: link vs unlink ==============" test_46e() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 touch $DIR1/$tfile-3 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 @@ -2415,6 +2468,7 @@ test_46e() { run_test 46e "pdirops: link and rename (tgt) ==============" test_46f() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 touch $DIR1/$tfile-3 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 @@ -2432,6 +2486,7 @@ test_46f() { run_test 46f "pdirops: link and rename (src) ==============" test_46g() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2448,6 +2503,7 @@ test_46g() { run_test 46g "pdirops: link vs getattr ==============" test_46h() { + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2465,6 +2521,7 @@ run_test 46h "pdirops: link vs readdir ==============" test_46i() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2483,8 +2540,10 @@ run_test 46i "pdirops: link vs remote mkdir" # test 47: remote mkdir and blocking operations test_47a() { + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $LFS mkdir -i 1 $DIR1/$tfile & PID1=$! ; pdo_sched @@ -2501,6 +2560,7 @@ run_test 47a "pdirops: remote mkdir vs mkdir" test_47b() { #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $LFS mkdir -i 1 $DIR1/$tfile & PID1=$! ; pdo_sched @@ -2517,6 +2577,7 @@ run_test 47b "pdirops: remote mkdir vs create" test_47c() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2534,6 +2595,7 @@ run_test 47c "pdirops: remote mkdir vs link" test_47d() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $LFS mkdir -i 1 $DIR1/$tfile & @@ -2551,6 +2613,7 @@ run_test 47d "pdirops: remote mkdir vs unlink" test_47e() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc touch $DIR1/$tfile-2 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -2569,6 +2632,7 @@ run_test 47e "pdirops: remote mkdir and rename (tgt)" test_47f() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $LFS mkdir -i 1 $DIR1/$tfile & @@ -2588,6 +2652,7 @@ test_47g() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return sync sync_all_data + cancel_lru_locks mdc #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 $LFS mkdir -i 1 $DIR1/$tfile & -- 1.8.3.1