LU-4460 mount: fix lmd_parse() to handle comma-separated NIDs

[fs/lustre-release.git] / lustre / tests / conf-sanity.sh

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index dc753df..546780d 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1315,7 +1315,9 @@ test_32newtarball() {
                count=$(($T32_BLIMIT / 1024 / 2))
        chown $T32_QID.$T32_QID $tmp/src/t32_qf_old
 
-       formatall
+       # format ost with comma-separated NIDs to verify LU-4460
+       local failnid="$(h2$NETTYPE 1.2.3.4),$(h2$NETTYPE 4.3.2.1)"
+       MGSNID="$MGSNID,$MGSNID" OSTOPT="--failnode=$failnid" formatall
 
        setupall
 
@@ -3291,7 +3293,13 @@ test_52() {
        do_node $ost1node 'mv '$objects' '${ost1mnt}'/lost+found'
        [ $? -eq 0 ] || { error "Unable to move objects"; return 14; }
 
+       # recover objects dry-run
+       echo "ll_recover_lost_found_objs dry_run"
+       do_node $ost1node "ll_recover_lost_found_objs -n -d $ost1mnt/O"
+       [ $? -eq 0 ] || { error "ll_recover_lost_found_objs failed"; return 15; }
+
        # recover objects
+       echo "ll_recover_lost_found_objs fix run"
        do_node $ost1node "ll_recover_lost_found_objs -d $ost1mnt/lost+found"
        [ $? -eq 0 ] || { error "ll_recover_lost_found_objs failed"; return 15; }