From 45e5e76e3295a926abce322b014374b5d5a2d6a3 Mon Sep 17 00:00:00 2001 From: Alexander Boyko Date: Fri, 13 Oct 2017 04:57:49 -0400 Subject: [PATCH] LU-8344 test: fix sanity 256 The test error Changelog catalog has wrong number of slots 1 is a result of the debugfs dump happaned before a previous changes were commited to a disk. The patch adds mds sync before debugfs command. Also it fixes temp file removal. Signed-off-by: Alexander Boyko Change-Id: Ic14a58956642f419b0f6d695027f88a0cad9fd39 Test-Parameters: trivial testlist=sanity Reviewed-on: https://review.whamcloud.com/29598 Reviewed-by: Sergey Cheremencev Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons --- lustre/tests/sanity.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 6ccaba7..c130a37 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -14891,11 +14891,12 @@ test_256() { #after mount new plainllog is used touch $DIR/$tdir/{11..19} - local TEMP256FILE=$(mktemp TEMP256XXXXXX) + do_facet mds1 sync + local TEMP256FILE=$(mktemp -u TEMP256XXXXXX) cat_sl=$(do_facet mds1 \ "$DEBUGFS -R \\\"dump changelog_catalog $TEMP256FILE\\\" $mdt_dev; \ llog_reader $TEMP256FILE | grep \\\"type=1064553b\\\" | wc -l") - rm $TEMP256FILE + do_facet mds1 rm $TEMP256FILE if (( cat_sl != 2 )); then do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user @@ -14904,11 +14905,12 @@ test_256() { $LFS changelog_clear $MDT0 $cl_user 0 - TEMP256FILE=$(mktemp TEMP256XXXXXX) + do_facet mds1 sync + TEMP256FILE=$(mktemp -u TEMP256XXXXXX) cat_sl=$(do_facet mds1 \ "$DEBUGFS -R \\\"dump changelog_catalog $TEMP256FILE\\\" $mdt_dev; \ llog_reader $TEMP256FILE | grep \\\"type=1064553b\\\" | wc -l") - rm $TEMP256FILE + do_facet mds1 rm $TEMP256FILE do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user -- 1.8.3.1