From e5116ab831c6b7c87594c52d9bdb5a786b35b956 Mon Sep 17 00:00:00 2001 From: Li Xi Date: Mon, 22 Aug 2016 18:17:18 +0800 Subject: [PATCH] LU-8551 test: Use mds1 rather than mds to operate on MDT0000 Use mds1 rather than mds to operate on MDT0000, fixed following cases: conf-sanity.sh: test_43, test_58, test_62 sanityn.sh: test_54, test_55. Test-Parameters: testlist=conf-sanity Test-Parameters: testlist=sanityn Change-Id: Ibe0b419f837e4478610d61b8efb54af93662a45e Signed-off-by: Gu Zheng Reviewed-on: http://review.whamcloud.com/22147 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Wang Shilong Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 12 ++++++------ lustre/tests/sanityn.sh | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 19f2276..69643ef 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -3009,7 +3009,7 @@ test_43a() { setup chmod ugo+x $DIR || error "chmod 0 failed" - set_conf_param_and_check mds \ + set_conf_param_and_check mds1 \ "$LCTL get_param -n mdt.$FSNAME-MDT0000.root_squash" \ "$FSNAME.mdt.root_squash" \ "0:0" @@ -3017,7 +3017,7 @@ test_43a() { "$LCTL get_param -n llite.${FSNAME}*.root_squash" \ "0:0" || error "check llite root_squash failed!" - set_conf_param_and_check mds \ + set_conf_param_and_check mds1 \ "$LCTL get_param -n mdt.$FSNAME-MDT0000.nosquash_nids" \ "$FSNAME.mdt.nosquash_nids" \ "NONE" @@ -3049,7 +3049,7 @@ test_43a() { # set root squash UID:GID to RUNAS_ID # root should be able to access only files owned by RUNAS_ID # - set_conf_param_and_check mds \ + set_conf_param_and_check mds1 \ "$LCTL get_param -n mdt.$FSNAME-MDT0000.root_squash" \ "$FSNAME.mdt.root_squash" \ "$RUNAS_ID:$RUNAS_ID" @@ -3119,7 +3119,7 @@ test_43a() { local NIDLIST=$($LCTL list_nids all | tr '\n' ' ') NIDLIST="2@gni $NIDLIST 192.168.0.[2,10]@tcp" NIDLIST=$(echo $NIDLIST | tr -s ' ' ' ') - set_conf_param_and_check mds \ + set_conf_param_and_check mds1 \ "$LCTL get_param -n mdt.$FSNAME-MDT0000.nosquash_nids" \ "$FSNAME-MDTall.mdt.nosquash_nids" \ "$NIDLIST" @@ -4266,7 +4266,7 @@ test_58() { # bug 22658 unmount_fstype $SINGLEMDS # restart MDS with missing llog files start_mds || error "unable to start MDS" - do_facet mds "$LCTL set_param fail_loc=0" + do_facet $SINGLEMDS "$LCTL set_param fail_loc=0" reformat } run_test 58 "missing llog files must not prevent MDT from mounting" @@ -4430,7 +4430,7 @@ test_62() { { skip "Need MDS version at least 2.2.51"; return 0; } echo "disable journal for mds" - do_facet mds $TUNE2FS -O ^has_journal $mdsdev || error "tune2fs failed" + do_facet mds1 $TUNE2FS -O ^has_journal $mdsdev || error "tune2fs failed" start_mds && error "MDT start should fail" echo "disable journal for ost" do_facet ost1 $TUNE2FS -O ^has_journal $ostdev || error "tune2fs failed" diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index 3d67e99..42b93fd 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -2522,7 +2522,7 @@ test_54_part1() echo "==> rename vs getattr vs setxattr should not deadlock" mkdir -p $DIR/d1/d2/d3 || error "(1) mkdir failed" - do_facet mds $LCTL set_param fail_loc=$1 + do_facet mds1 $LCTL set_param fail_loc=$1 mv -T $DIR/d1/d2/d3 $DIR/d1/d3 & PID1=$! @@ -2544,7 +2544,7 @@ test_54_part2() { echo "==> rename vs getattr vs open vs getattr should not deadlock" mkdir -p $DIR/d1/d2/d3 || error "(1) mkdir failed" - do_facet mds $LCTL set_param fail_loc=$1 + do_facet mds1 $LCTL set_param fail_loc=$1 mv -T $DIR/d1/d2/d3 $DIR/d1/d3 & PID1=$! @@ -2589,7 +2589,7 @@ test_55a() { mkdir -p $DIR/d1/d2 $DIR/d3 || error "(1) mkdir failed" #define OBD_FAIL_MDS_RENAME4 0x156 - do_facet mds $LCTL set_param fail_loc=0x80000156 + do_facet mds1 $LCTL set_param fail_loc=0x80000156 mv -T $DIR/d1/d2 $DIR/d3/d2 & PID1=$! @@ -2607,7 +2607,7 @@ test_55b() mkdir -p $DIR/d1/d2 $DIR/d3 || error "(1) mkdir failed" #define OBD_FAIL_MDS_RENAME4 0x156 - do_facet mds $LCTL set_param fail_loc=0x80000156 + do_facet mds1 $LCTL set_param fail_loc=0x80000156 mv -T $DIR/d1/d2 $DIR/d3/d2 & PID1=$! @@ -2625,7 +2625,7 @@ test_55c() mkdir -p $DIR/d1/d2 $DIR/d3 || error "(1) mkdir failed" #define OBD_FAIL_MDS_RENAME4 0x156 - do_facet mds $LCTL set_param fail_loc=0x156 + do_facet mds1 $LCTL set_param fail_loc=0x156 mv -T $DIR/d1/d2 $DIR/d3/d2 & PID1=$! @@ -2653,7 +2653,7 @@ test_55d() touch $DIR/f1 #define OBD_FAIL_MDS_RENAME3 0x155 - do_facet mds $LCTL set_param fail_loc=0x155 + do_facet mds1 $LCTL set_param fail_loc=0x155 mv $DIR/f1 $DIR/$tdir & PID1=$! sleep 2 -- 1.8.3.1