From cdbc08d9dedb56610490640afe1e99a4b71ceea2 Mon Sep 17 00:00:00 2001
From: "eugen.betke" <betke@dkrz.de>
Date: Tue, 13 Nov 2018 16:37:23 +0100
Subject: [PATCH] Fixed cache dropping

---
 benchmark/run_v2.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/benchmark/run_v2.sh b/benchmark/run_v2.sh
index 52c060d73..7ffad920c 100755
--- a/benchmark/run_v2.sh
+++ b/benchmark/run_v2.sh
@@ -36,8 +36,6 @@ for API in ${API_ARR[@]}; do
         [ ! -d $OUTDIR ] && mkdir $OUTDIR
         touch $BENCHFILE
 
-        $MPIEXEC $MPIEXEC_PARAMS ./drop_caches.sh
-
         IOR_TYPE_OPTS=""
         if [[ "read" == $TYPE ]]; then
             IOR_TYPE_OPTS="-r"
@@ -46,17 +44,14 @@ for API in ${API_ARR[@]}; do
             lfs getstripe $TESTDIR | tee -a $BENCHFILE
 
         elif [[ "write" == $TYPE ]]; then
-set -x
             IOR_TYPE_OPTS="-w"
             LUSTRE_TESTFILE="$TD/sharedwrite/file"
             TESTDIR="$(dirname $LUSTRE_TESTFILE)"
             [ -d $TESTDIR ] && rm -r $TESTDIR || mkdir -p $TESTDIR 
             lfs setstripe	-c $((2 * $NN)) $TESTDIR
             lfs getstripe $TESTDIR | tee -a $BENCHFILE
-set +x
         fi
 
-
         IOR_PARAMS="-i 1 "
         IOR_PARAMS+="-s 1 -t $T -b $((4800 * 1024 * 1024 * 32 / $PPN)) "
         IOR_PARAMS+="-D 60 -O stoneWallingWearOut=1 "
@@ -64,10 +59,13 @@ set +x
         IOR_PARAMS+="-e -g -z -k -o $LUSTRE_TESTFILE $IOR_TYPE_OPTS "
         
         if [[ "isc17" == ${hostname:0:5} ]]; then
+            $MPIEXEC -np $NN --hosts $(hosts $NN) ./drop_caches.sh
+
             MPIEXEC_PARAMS=" -ppn $PPN -np $(($NN * $PPN)) --hosts $(hosts $NN) -wdir $WD "
             MPIEXEC_PARAMS+="-genv MV2_NUM_HCAS 1 "
             MPIEXEC_PARAMS+="-genv MV2_CPU_BINDING_LEVEL core "
             MPIEXEC_PARAMS+="-genv MV2_CPU_BINDING_POLICY scatter "
+
         elif [[ "m" == ${hostname:0:1} ]]; then
             #MPIEXEC_PARAMS=" -ppn $PPN -n $(($NN * $PPN)) -wdir $WD --host $(hosts $NN) "
             MPIEXEC_PARAMS=" -ppn $PPN -n $(($NN * $PPN)) -wdir $WD "