Whamcloud - gitweb
LU-8344 test: fix sanity 256 98/29598/3
authorAlexander Boyko <c17825@cray.com>
Fri, 13 Oct 2017 08:57:49 +0000 (04:57 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Thu, 19 Oct 2017 06:18:16 +0000 (06:18 +0000)
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 <c17825@cray.com>
Change-Id: Ic14a58956642f419b0f6d695027f88a0cad9fd39
Test-Parameters: trivial testlist=sanity
Reviewed-on: https://review.whamcloud.com/29598
Reviewed-by: Sergey Cheremencev <cherementsev@gmail.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
lustre/tests/sanity.sh

index 6ccaba7..c130a37 100755 (executable)
@@ -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