tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject git commit: TEZ-666. Fix MRRSleep to respect command line parameters. (sseth)
Date Mon, 09 Dec 2013 23:19:37 GMT
Updated Branches:
  refs/heads/master a474e5e64 -> 7bcf397c1


TEZ-666. Fix MRRSleep to respect command line parameters. (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/7bcf397c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/7bcf397c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/7bcf397c

Branch: refs/heads/master
Commit: 7bcf397c15c3228be778ab1ab0ada534f23b256c
Parents: a474e5e
Author: Siddharth Seth <sseth@apache.org>
Authored: Mon Dec 9 15:04:34 2013 -0800
Committer: Siddharth Seth <sseth@apache.org>
Committed: Mon Dec 9 15:04:34 2013 -0800

----------------------------------------------------------------------
 .../java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java | 2 +-
 .../main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java  | 2 +-
 .../src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7bcf397c/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
index a73b3fc..38cd4e1 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
@@ -209,7 +209,7 @@ public class FilterLinesByWord {
     Vertex stage2Vertex = new Vertex("stage2", new ProcessorDescriptor(
         FilterByWordOutputProcessor.class.getName()).setUserPayload(MRHelpers
         .createUserPayloadFromConf(stage2Conf)), 1,
-        MRHelpers.getMapResource(stage2Conf));
+        MRHelpers.getReduceResource(stage2Conf));
     stage2Vertex.setJavaOpts(MRHelpers.getReduceJavaOpts(stage2Conf)).setTaskLocalResources(commonLocalResources);
     Map<String, String> stage2Env = new HashMap<String, String>();
     MRHelpers.updateEnvironmentForMRTasks(stage2Conf, stage2Env, false);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7bcf397c/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java
b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java
index 095e1b4..ade06f1 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java
@@ -799,7 +799,7 @@ public class MRRSleepJob extends Configured implements Tool {
     reduceSleepCount = (int)Math.ceil(reduceSleepTime / ((double)recSleepTime));
     iReduceSleepCount = (int)Math.ceil(iReduceSleepTime / ((double)recSleepTime));
 
-    TezConfiguration conf = new TezConfiguration();
+    TezConfiguration conf = new TezConfiguration(getConf());
     FileSystem remoteFs = FileSystem.get(conf);
 
     TezClient tezClient = new TezClient(conf);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7bcf397c/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
index 600be91..bc93a70 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
@@ -111,7 +111,8 @@ public class TaskSpec implements Writable {
   @Override
   public String toString() {
     StringBuffer sb = new StringBuffer();
-    sb.append("TaskAttemptID:" + taskAttemptId);
+    sb.append("VertexName: " + vertexName);
+    sb.append(", TaskAttemptID:" + taskAttemptId);
     sb.append(", processorName=" + processorDescriptor.getClassName()
         + ", inputSpecListSize=" + inputSpecList.size()
         + ", outputSpecListSize=" + outputSpecList.size());


Mime
View raw message