b=22960 Update mdsrate scripts to parse new format

i=nico

diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh
index aa99a1c..07b04e5 100644 (file)
--- a/lustre/tests/mdsrate-create-large.sh
+++ b/lustre/tests/mdsrate-create-large.sh
@@ -68,7 +68,7 @@ else
     log "===== $0 ### 1 NODE UNLINK ###"
 
     if [ -f "$LOG" ]; then
     log "===== $0 ### 1 NODE UNLINK ###"
 
     if [ -f "$LOG" ]; then

-        CREATED=$(awk '/total:/ { print $7 }' $LOG)
+        CREATED=$(sed -n '/^Rate:/s/^.* \([0-9]*\) creates .*/\1/p' $LOG)

         [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
     fi
 
         [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
     fi
 


@@ -111,7 +111,7 @@ else
     log "===== $0 ### $NUM_CLIENTS NODES UNLINK ###"
 
     if [ -f "$LOG" ]; then
     log "===== $0 ### $NUM_CLIENTS NODES UNLINK ###"
 
     if [ -f "$LOG" ]; then

-        CREATED=$(awk '/total:/ { print $7 }' $LOG)
+        CREATED=$(sed -n '/^Rate:/s/^.* \([0-9]*\) creates .*/\1/p' $LOG)

         [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
     fi
 
         [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
     fi
 

diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh
index 03ca9bb..59b33a6 100644 (file)
--- a/lustre/tests/mdsrate-create-small.sh
+++ b/lustre/tests/mdsrate-create-small.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+ #!/bin/bash

 #
 # This test was used in a set of CMD3 tests (cmd3-3 test). 
 
 #
 # This test was used in a set of CMD3 tests (cmd3-3 test). 
 


@@ -80,7 +80,7 @@ else
         log "===== $0 ### 1 NODE UNLINK ###"
 
         if [ -f "$LOG" ]; then
         log "===== $0 ### 1 NODE UNLINK ###"
 
         if [ -f "$LOG" ]; then

-            CREATED=$(awk '/total:/ { print $7 }' $LOG)
+            CREATED=$(sed -n '/^Rate:/s/^.* \([0-9]*\) creates .*/\1/p' $LOG)

            [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
         fi
 
            [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
         fi
 


@@ -130,7 +130,7 @@ else
         log "===== $0 ### $NUM_CLIENTS NODES UNLINK with $THREADS_PER_CLIENT threads per client ###"
 
         if [ -f "$LOG" ]; then
         log "===== $0 ### $NUM_CLIENTS NODES UNLINK with $THREADS_PER_CLIENT threads per client ###"
 
         if [ -f "$LOG" ]; then

-            CREATED=$(awk '/total:/ { print $7 }' $LOG)
+            CREATED=$(sed -n '/^Rate:/s/^.* \([0-9]*\) creates .*/\1/p' $LOG)

             [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
         fi
 
             [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
         fi