b=20054

o=rread
i=girish
i=eric.mei

print out stripe data. regression caused by 18442

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 16ba788..6a93c7d 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2393,7 +2393,7 @@ get_stripe_info() {
 
        stripe_size=`awk '$1 ~ /size/ {print $2}' $tmp_file`
        stripe_count=`awk '$1 ~ /count/ {print $2}' $tmp_file`
-       stripe_index=`awk '/obdidx/ {start = 1; getline; print $1; exit}' $tmp_file`
+       stripe_index=`awk '$1 ~ /stripe_offset/ {print $2}' $tmp_file`
        rm -f $tmp_file
 }
 

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index 425eef4..cf910d2 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -897,7 +897,7 @@ static void lov_dump_user_lmm_join(struct lov_user_md_v1 *lum, char *path,
                              lumj->lmm_extent_count);
         }
 
-        if (body && !(header && VERBOSE_ALL)) {
+        if (body) {
                 unsigned long long start = -1, end = 0;
                 if (!quiet && obdstripe == 1)
                         llapi_printf(LLAPI_MSG_NORMAL,
@@ -974,7 +974,7 @@ static void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
                 lov_dump_user_lmm_header(lum, NULL, is_dir, header, quiet,
                                          pool_name);
 
-        if (body && !(header && VERBOSE_ALL)) {
+        if (body) {
                 if ((!quiet) && (obdstripe == 1))
                         llapi_printf(LLAPI_MSG_NORMAL,
                                      "\tobdidx\t\t objid\t\tobjid\t\t group\n");