TEZ-149. MRRuntimeTask should read local dir configuration from config rather than from env. (sseth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/9fb21703 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/9fb21703 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/9fb21703 Branch: refs/heads/master Commit: 9fb21703c8bd73a5ffd15a39d7a598bcc0ce32c7 Parents: 8298190 Author: Siddharth Seth <[email protected]> Authored: Tue May 21 11:28:06 2013 -0700 Committer: Siddharth Seth <[email protected]> Committed: Tue May 21 11:28:06 2013 -0700 ---------------------------------------------------------------------- .../common/sort/impl/dflt/DefaultSorter.java | 2 +- .../processor/reduce/ReduceProcessor.java | 2 +- .../apache/tez/mapreduce/task/MRRuntimeTask.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9fb21703/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java index 2cf5ab4..e567492 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java @@ -219,7 +219,7 @@ public class DefaultSorter extends ExternalSorter implements IndexedSortable { } if (partition < 0 || partition >= partitions) { throw new IOException("Illegal partition for " + key + " (" + - partition + ")"); + partition + ")" + ", TotalPartitions: " + partitions); } checkSpillException(); bufferRemaining -= METASIZE; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9fb21703/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java index 9ae07ee..ce49726 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java @@ -303,7 +303,7 @@ implements Processor { org.apache.hadoop.mapreduce.Reducer reducer = (org.apache.hadoop.mapreduce.Reducer) ReflectionUtils.newInstance(taskContext.getReducerClass(), job); - + org.apache.hadoop.mapreduce.RecordWriter trackedRW = new org.apache.hadoop.mapreduce.RecordWriter() { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9fb21703/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/task/MRRuntimeTask.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/task/MRRuntimeTask.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/task/MRRuntimeTask.java index 6091d4b..3b51889 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/task/MRRuntimeTask.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/task/MRRuntimeTask.java @@ -198,7 +198,7 @@ public class MRRuntimeTask extends RuntimeTask { private static void setupDistributedCacheConfig(final JobConf job) throws IOException { - String localWorkDir = System.getenv(System.getenv(Environment.PWD.name())); + String localWorkDir = (job.get(TezJobConfig.TASK_LOCAL_RESOURCE_DIR)); // ^ ^ all symlinks are created in the current work-dir // Update the configuration object with localized archives.
