tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject git commit: TEZ-498. Fix use of Shuffle service after changes in YARN/MR due to YARN-1229. (hitesh)
Date Wed, 25 Sep 2013 18:45:33 GMT
Updated Branches:
  refs/heads/master 13724a978 -> f00e3c259


TEZ-498. Fix use of Shuffle service after changes in YARN/MR due to YARN-1229. (hitesh)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/f00e3c25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/f00e3c25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/f00e3c25

Branch: refs/heads/master
Commit: f00e3c25936bd4ec3b895cf7192516c3dc1994b0
Parents: 13724a9
Author: Hitesh Shah <hitesh@apache.org>
Authored: Wed Sep 25 11:45:17 2013 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Wed Sep 25 11:45:17 2013 -0700

----------------------------------------------------------------------
 .../tez/runtime/library/common/shuffle/server/ShuffleHandler.java  | 2 +-
 .../apache/tez/runtime/library/shuffle/common/ShuffleUtils.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/f00e3c25/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/server/ShuffleHandler.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/server/ShuffleHandler.java
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/server/ShuffleHandler.java
index 9a206c6..2f934e9 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/server/ShuffleHandler.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/server/ShuffleHandler.java
@@ -120,7 +120,7 @@ public class ShuffleHandler extends AuxiliaryService {
   private int sslFileBufferSize;
 
   public static final String MAPREDUCE_SHUFFLE_SERVICEID =
-      "mapreduce.shuffle";
+      "mapreduce_shuffle";
 
   private static final Map<String,String> userRsrc =
     new ConcurrentHashMap<String,String>();

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/f00e3c25/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java
index 7479e7e..5bbd6fb 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/ShuffleUtils.java
@@ -32,7 +32,7 @@ import org.apache.tez.runtime.library.common.security.JobTokenSecretManager;
 
 public class ShuffleUtils {
 
-  public static String SHUFFLE_HANDLER_SERVICE_ID = "mapreduce.shuffle";
+  public static String SHUFFLE_HANDLER_SERVICE_ID = "mapreduce_shuffle";
 
   public static SecretKey getJobTokenSecretFromTokenBytes(ByteBuffer meta)
       throws IOException {


Mime
View raw message