b=21927 recovery-small, replay-single 18 <-> 20 interop fix

i=Mikhail.Pershin

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index dbe4f4f..b564e82 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -725,7 +725,8 @@ test_26b() {      # bug 10140 - evict dead exports by pinger
                 { error "Failed to mount $MOUNT2"; return 2; }
        sleep 1 # wait connections being established
 
-       local MDS_NEXP=$(do_facet mds lctl get_param -n mds.${mds_svc}.num_exports | cut -d' ' -f2)
+       local dev=$(get_mds_mdt_device_proc_path)
+       local MDS_NEXP=$(do_facet mds lctl get_param -n $dev.${mds_svc}.num_exports | cut -d' ' -f2)
        local OST_NEXP=$(do_facet ost1 lctl get_param -n obdfilter.${ost1_svc}.num_exports | cut -d' ' -f2)
 
        echo starting with $OST_NEXP OST and $MDS_NEXP MDS exports

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 3d50f3d..008d3d0 100644 (file)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -875,9 +875,10 @@ test_44a() { # was test_44
         at_max_set 40 mds
     fi
 
+    local dev=$(get_mds_mdt_device_proc_path)
     for i in `seq 1 10`; do
         echo "$i of 10 ($(date +%s))"
-        do_facet mds "lctl get_param -n mdt.MDS.mds.timeouts | grep service"
+        do_facet mds "lctl get_param -n mdt.*.$dev.timeouts | grep service"
         #define OBD_FAIL_TGT_CONN_RACE     0x701
         do_facet mds "lctl set_param fail_loc=0x80000701"
         # lctl below may fail, it is valid case
@@ -896,9 +897,10 @@ test_44b() {
     [ "$mdcdev" ] || return 2
     [ $(echo $mdcdev | wc -w) -eq 1 ] || { echo $mdcdev=$mdcdev && return 3; }
 
+    local dev=$(get_mds_mdt_device_proc_path)
     for i in `seq 1 10`; do
         echo "$i of 10 ($(date +%s))"
-        do_facet mds "lctl get_param -n mdt.MDS.mds.timeouts | grep service"
+        do_facet mds "lctl get_param -n mdt.*.$dev.timeouts | grep service"
         #define OBD_FAIL_TGT_DELAY_RECONNECT 0x704
         do_facet mds "lctl set_param fail_loc=0x80000704"
         # lctl below may fail, it is valid case