re-vert shadow b1_6 1.42.10.80 (robert.read 1.42.10.76.2.4 merge)

and 1.42.10.76.2.5 commits:
move debug code && sync to appropriate place

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 3ebd2ce..926cf13 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -268,24 +268,21 @@ mount_facet() {
     local dev=${facet}_dev
     local opt=${facet}_opt
     echo "Starting ${facet}: ${!opt} $@ ${!dev} ${MOUNT%/*}/${facet}"
-
     do_facet ${facet} mount -t lustre ${!opt} $@ ${!dev} ${MOUNT%/*}/${facet}     
     RC=${PIPESTATUS[0]}
-    if [ $RC -eq 0 ]; then
-        label=$(do_facet ${facet} "e2label ${!dev}")
-        [ -z "$label" ] && echo no label for ${!dev} && exit 1
-        eval export ${facet}_svc=${label}
-        echo Started ${label}
-    fi
-
     if [ $RC -ne 0 ]; then
         echo "mount -t lustre $@ ${!dev} ${MOUNT%/*}/${facet}"
         echo "Start of ${!dev} on ${facet} failed ${RC}"
+    else
         do_facet ${facet} "lctl set_param debug=$PTLDEBUG; \
             lctl set_param subsystem_debug=${SUBSYSTEM# }; \
             lctl set_param debug_mb=${DEBUG_SIZE}; \
             sync"
-
+ 
+        label=$(do_facet ${facet} "e2label ${!dev}")
+        [ -z "$label" ] && echo no label for ${!dev} && exit 1
+        eval export ${facet}_svc=${label}
+        echo Started ${label}
     fi
     return $RC
 }