From aa9938a26b2fd58afc53bd25020e8940464d1855 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Mon, 27 Jun 2016 10:58:09 +0200 Subject: [PATCH 1/1] LU-8305 tests: add traces for sanity-sec Add more traces in sanity-sec.sh to help debug test failures. Also add traces in mdt_get_root() function. Test-Parameters: trivial testlist=sanity-sec,sanity-sec,sanity-sec,sanity-sec Signed-off-by: Sebastien Buisson Change-Id: I52291dc1b7c815eb4a845d4cd6a9c926122d107b Reviewed-on: http://review.whamcloud.com/20990 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Emoly Liu --- lustre/mdt/mdt_handler.c | 2 ++ lustre/tests/sanity-sec.sh | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index f6b0e7a..0b31287 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -380,6 +380,7 @@ static int mdt_get_root(struct tgt_session_info *tsi) nodemap_fileset = nodemap_get_fileset(exp->exp_target_data.ted_nodemap); if (nodemap_fileset && nodemap_fileset[0]) { + CDEBUG(D_INFO, "nodemap fileset is %s\n", nodemap_fileset); if (fileset) { /* consider fileset from client as a sub-fileset * of the nodemap one */ @@ -397,6 +398,7 @@ static int mdt_get_root(struct tgt_session_info *tsi) } if (fileset) { + CDEBUG(D_INFO, "Getting fileset %s\n", fileset); rc = mdt_lookup_fileset(info, fileset, &repbody->mbo_fid1); if (rc < 0) GOTO(out, rc = err_serious(rc)); diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index 30bfeb2..bb537da 100755 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -880,6 +880,8 @@ wait_nm_sync() { local mgs_ip=$(host_nids_address $mgs_HOST $NETTYPE | cut -d' ' -f1) local i + echo "On MGS ${mgs_ip}, ${proc_param} = $out1" + # wait up to 10 seconds for other servers to sync with mgs for i in $(seq 1 10); do for node in $(all_server_nodes); do @@ -891,6 +893,7 @@ wait_nm_sync() { out2=$(do_node $node_ip $LCTL get_param \ nodemap.$proc_param 2>/dev/null) + echo "On $node ${node_ip}, ${proc_param} = $out2" [ "$out1" != "$out2" ] && is_sync=false && break done $is_sync && break @@ -1689,7 +1692,7 @@ test_27() { # test mount point content do_node ${clients_arr[0]} test -d $MOUNT/$subdir || - error "fileset not cleared on nodemap c0" + (ls $MOUNT ; error "fileset not cleared on nodemap c0") fileset_test_cleanup nodemap_test_cleanup -- 1.8.3.1