LU-13514 tests: replace nid in conf-sanity test_32

Need replace_nid for test_32a. Else the mdc cannot
be initialzed and prevent client mounting hung.

Test-Parameters: trivial
Test-Parameters: env=ONLY=32a,ONLY_REPEAT=20 fstype=ldiskfs testlist=conf-sanity
Signed-off-by: Yang Sheng <ys@whamcloud.com>
Change-Id: I651f5728ad4ff96a309ed599490c9dd6ed9c5274
Reviewed-on: https://review.whamcloud.com/40537
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 8ca4fab..7be040e 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1787,19 +1787,22 @@ t32_test() {
                        [[ "$MGS_VERSION" -ge $(version_code 2.3.59) ]] ||
                        skip "LU-2200: Cannot run over IB w/o lctl replace_nids "
                                "(Need MGS version at least 2.3.59)"
+               fi
 
-                       local osthost=$(facet_active_host ost1)
-                       local ostnid=$(do_node $osthost $LCTL list_nids | head -1)
+               local osthost=$(facet_active_host ost1)
+               local ostnid=$(do_node $osthost $LCTL list_nids | head -1)
 
-                       mopts=nosvc
-                       if [ "$mds1_FSTYPE" == ldiskfs ]; then
-                               mopts="loop,$mopts"
-                       fi
-                       $r $MOUNT_CMD -o $mopts $mdt_dev $tmp/mnt/mdt
-                       $r $LCTL replace_nids $fsname-OST0000 $ostnid
-                       $r $LCTL replace_nids $fsname-MDT0000 $nid
-                       $r $UMOUNT $tmp/mnt/mdt
+               mopts=nosvc
+               if [ "$mds1_FSTYPE" == ldiskfs ]; then
+                       mopts="loop,$mopts"
+               fi
+               $r $MOUNT_CMD -o $mopts $mdt_dev $tmp/mnt/mdt
+               $r $LCTL replace_nids $fsname-OST0000 $ostnid
+               $r $LCTL replace_nids $fsname-MDT0000 $nid
+               if $mdt2_is_available; then
+                       $r $LCTL replace_nids $fsname-MDT0001 $nid
                fi
+               $r $UMOUNT $tmp/mnt/mdt
 
                mopts=exclude=$fsname-OST0000
                if [ "$mds1_FSTYPE" == ldiskfs ]; then