LU-7222 tests: add Mulitple MDTs to test_84

Add multiple MDTs to conf_sanity.sh test_84(), and
add more information into the error message when
config log corrupted.

Signed-off-by: wang di <di.wang@intel.com>
Change-Id: I45160d053f8dd52ca3230888e720fc04102d50ab
Reviewed-on: http://review.whamcloud.com/16662
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/obdclass/llog_osd.c b/lustre/obdclass/llog_osd.c
index 8dc6c40..a099df2 100644 (file)
--- a/lustre/obdclass/llog_osd.c
+++ b/lustre/obdclass/llog_osd.c
@@ -860,10 +860,10 @@ static int llog_osd_next_block(const struct lu_env *env,
                /* this shouldn't happen */
                if (tail->lrt_index == 0) {
                        CERROR("%s: invalid llog tail at log id "DOSTID"/%u "
-                              "offset "LPU64"\n",
+                              "offset "LPU64" bytes %d\n",
                               o->do_lu.lo_dev->ld_obd->obd_name,
                               POSTID(&loghandle->lgh_id.lgl_oi),
-                              loghandle->lgh_id.lgl_ogen, *cur_offset);
+                              loghandle->lgh_id.lgl_ogen, *cur_offset, rc);
                        GOTO(out, rc = -EINVAL);
                }
                if (tail->lrt_index < next_idx) {

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 4f1cb97..49a4756 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -5545,11 +5545,13 @@ test_84() {
        local time_min=$(recovery_time_min)
        local recovery_duration
        local completed_clients
+       local correct_clients
        local wrap_up=5
 
+       load_modules
        echo "start mds service on $(facet_active_host $facet)"
-       start $facet ${dev} $MDS_MOUNT_OPTS \
-           "-o recovery_time_hard=$time_min,recovery_time_soft=$time_min" $@ ||
+       start_mds \
+       "-o recovery_time_hard=$time_min,recovery_time_soft=$time_min" $@ ||
                error "start MDS failed"
 
        start_ost
@@ -5583,8 +5585,10 @@ test_84() {
        completed_clients=$(do_facet $SINGLEMDS \
                "$LCTL get_param -n mdt.$FSNAME-MDT0000.recovery_status" |
                awk '/completed_clients/ { print $2 }')
-       [ "$completed_clients" = "1/2" ] ||
-               error "completed_clients != 1/2: $completed_clients"
+
+       correct_clients="$MDSCOUNT/$((MDSCOUNT+1))"
+       [ "$completed_clients" = "${correct_clients}" ] ||
+               error "$completed_clients != $correct_clients"
 
        do_facet $SINGLEMDS "lctl set_param fail_loc=0"
        umount_client $MOUNT1