HADOOP-3178. Fix GridMix scripts for small and medium jobs to handle input paths differently. Contributed by Mukund Madhugiri.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@644990 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -508,6 +508,9 @@ Trunk (unreleased changes)
     HADOOP-3044. NNBench sets the right configuration for the mapper.
     (Hairong Kuang)
 
+    HADOOP-3178. Fix GridMix scripts for small and medium jobs
+    to handle input paths differently. (Mukund Madhugiri via nigel)
+
 Release 0.16.3 - Unreleased
 
   BUG FIXES

src/test/gridmix/javasort/text-sort.medium

@@ -4,7 +4,7 @@ GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
-INDIR=${VARINFLTEXT}/part-000*0,${VARINFLTEXT}/part-000*1,${VARINFLTEXT}/part-000*2
+INDIR="${VARINFLTEXT}/{part-000*0,part-000*1,part-000*2}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/sort-out-dir-medium_$Date

src/test/gridmix/javasort/text-sort.small

@@ -4,7 +4,7 @@ GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
-INDIR=${VARINFLTEXT}/part-00000,${VARINFLTEXT}/part-00001,${VARINFLTEXT}/part-00002
+INDIR="${VARINFLTEXT}/{part-00000,part-00001,part-00002}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/sort-out-dir-small_$Date

src/test/gridmix/monsterQuery/monster_query.medium

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=$NUM_OF_REDUCERS_FOR_MEDIUM_JOB
-INDIR=${FIXCOMPSEQ}/part-000*0,${FIXCOMPSEQ}/part-000*1,${FIXCOMPSEQ}/part-000*2
+INDIR="${FIXCOMPSEQ}/{part-000*0,part-000*1,part-000*2}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/mq-out-dir-medium_$Date.1

src/test/gridmix/monsterQuery/monster_query.small

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=$NUM_OF_REDUCERS_FOR_SMALL_JOB
-INDIR=${FIXCOMPSEQ}/part-00000,${FIXCOMPSEQ}/part-00001,${FIXCOMPSEQ}/part-00002
+INDIR="${FIXCOMPSEQ}/{part-00000,part-00001,part-00002}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/mq-out-dir-small_$Date.1

src/test/gridmix/pipesort/text-sort.medium

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=$NUM_OF_REDUCERS_FOR_MEDIUM_JOB
-INDIR=${VARINFLTEXT}/part-000*0,${VARINFLTEXT}/part-000*1,${VARINFLTEXT}/part-000*2
+INDIR="${VARINFLTEXT}/{part-000*0,part-000*1,part-000*2}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/pipe-out-dir-medium_$Date

src/test/gridmix/pipesort/text-sort.small

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=$NUM_OF_REDUCERS_FOR_SMALL_JOB
-INDIR=${VARINFLTEXT}/part-00000,${VARINFLTEXT}/part-00001,${VARINFLTEXT}/part-00002
+INDIR="${VARINFLTEXT}/{part-00000,part-00001,part-00002}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/pipe-out-dir-small_$Date

src/test/gridmix/streamsort/text-sort.medium

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=$NUM_OF_REDUCERS_FOR_MEDIUM_JOB
-INDIR=${VARINFLTEXT}/part-000*0,${VARINFLTEXT}/part-000*1,${VARINFLTEXT}/part-000*2
+INDIR="${VARINFLTEXT}/{part-000*0,part-000*1,part-000*2}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/stream-out-dir-medium_$Date

src/test/gridmix/streamsort/text-sort.small

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=$NUM_OF_REDUCERS_FOR_SMALL_JOB
-INDIR=${VARINFLTEXT}/part-00000,${VARINFLTEXT}/part-00001,${VARINFLTEXT}/part-00002
+INDIR="${VARINFLTEXT}/{part-00000,part-00001,part-00002}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/stream-out-dir-small_$Date

src/test/gridmix/submissionScripts/monsterQueriesToSameCluster

@@ -8,7 +8,7 @@ PROCESSES=""
 for ((i=0; i < $NUM_OF_SMALL_JOBS_PER_CLASS; i++))
 do
     echo $i
-    $GRID_MIX_HOME/monsterQuery/monster_query.small  2>&1 > monster_query.medium.$i.out &
+    $GRID_MIX_HOME/monsterQuery/monster_query.small  2>&1 > monster_query.small.$i.out &
     PROCESSES="${PROCESSES} $!"
     $GRID_MIX_HOME/submissionScripts/sleep_if_too_busy
 done

src/test/gridmix/webdatascan/webdata_scan.medium

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=1
-INDIR=${VARCOMPSEQ}/part-000*0,${VARCOMPSEQ}/part-000*1,${VARCOMPSEQ}/part-000*2
+INDIR="${VARCOMPSEQ}/{part-000*0,part-000*1,part-000*2}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/webdata-scan-out-dir-medium_$Date

src/test/gridmix/webdatascan/webdata_scan.small

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=1
-INDIR=${VARCOMPSEQ}/part-00000,${VARCOMPSEQ}/part-00001,${VARCOMPSEQ}/part-00002
+INDIR="${VARCOMPSEQ}/{part-00000,part-00001,part-00002}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/webdata-scan-out-dir-small_$Date

src/test/gridmix/webdatasort/webdata_sort.medium

@@ -5,7 +5,7 @@ GRID_DIR=`cd "$GRID_DIR"; pwd`
 source $GRID_DIR/../gridmix-env
 
 NUM_OF_REDUCERS=$NUM_OF_REDUCERS_FOR_MEDIUM_JOB
-INDIR=${VARCOMPSEQ}/part-0000,${VARCOMPSEQ}/part-0001
+INDIR="${VARCOMPSEQ}/{part-0000,part-0001}"
 Date=`date +%F-%H-%M-%S`
 
 OUTDIR=perf-out/webdata-sort-out-dir-medium_$Date