You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ni...@apache.org on 2008/04/05 01:17:18 UTC
svn commit: r644990 - in /hadoop/core/trunk: ./ src/test/gridmix/javasort/
src/test/gridmix/monsterQuery/ src/test/gridmix/pipesort/
src/test/gridmix/streamsort/ src/test/gridmix/submissionScripts/
src/test/gridmix/webdatascan/ src/test/gridmix/webdata...
Author: nigel
Date: Fri Apr 4 16:17:16 2008
New Revision: 644990
URL: http://svn.apache.org/viewvc?rev=644990&view=rev
Log:
HADOOP-3178. Fix GridMix scripts for small and medium jobs to handle input paths differently. Contributed by Mukund Madhugiri.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/test/gridmix/javasort/text-sort.medium
hadoop/core/trunk/src/test/gridmix/javasort/text-sort.small
hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.medium
hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.small
hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.medium
hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.small
hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.medium
hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.small
hadoop/core/trunk/src/test/gridmix/submissionScripts/monsterQueriesToSameCluster
hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.medium
hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.small
hadoop/core/trunk/src/test/gridmix/webdatasort/webdata_sort.medium
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Apr 4 16:17:16 2008
@@ -508,6 +508,9 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/javasort/text-sort.medium
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/javasort/text-sort.medium?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/javasort/text-sort.medium (original)
+++ hadoop/core/trunk/src/test/gridmix/javasort/text-sort.medium Fri Apr 4 16:17:16 2008
@@ -4,7 +4,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/javasort/text-sort.small
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/javasort/text-sort.small?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/javasort/text-sort.small (original)
+++ hadoop/core/trunk/src/test/gridmix/javasort/text-sort.small Fri Apr 4 16:17:16 2008
@@ -4,7 +4,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.medium
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.medium?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.medium (original)
+++ hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.medium Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.small
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.small?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.small (original)
+++ hadoop/core/trunk/src/test/gridmix/monsterQuery/monster_query.small Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.medium
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.medium?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.medium (original)
+++ hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.medium Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.small
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.small?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.small (original)
+++ hadoop/core/trunk/src/test/gridmix/pipesort/text-sort.small Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.medium
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.medium?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.medium (original)
+++ hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.medium Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.small
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.small?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.small (original)
+++ hadoop/core/trunk/src/test/gridmix/streamsort/text-sort.small Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/submissionScripts/monsterQueriesToSameCluster
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/submissionScripts/monsterQueriesToSameCluster?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/submissionScripts/monsterQueriesToSameCluster (original)
+++ hadoop/core/trunk/src/test/gridmix/submissionScripts/monsterQueriesToSameCluster Fri Apr 4 16:17:16 2008
@@ -8,7 +8,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.medium
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.medium?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.medium (original)
+++ hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.medium Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.small
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.small?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.small (original)
+++ hadoop/core/trunk/src/test/gridmix/webdatascan/webdata_scan.small Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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
Modified: hadoop/core/trunk/src/test/gridmix/webdatasort/webdata_sort.medium
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/gridmix/webdatasort/webdata_sort.medium?rev=644990&r1=644989&r2=644990&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/gridmix/webdatasort/webdata_sort.medium (original)
+++ hadoop/core/trunk/src/test/gridmix/webdatasort/webdata_sort.medium Fri Apr 4 16:17:16 2008
@@ -5,7 +5,7 @@
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