Repository: tez Updated Branches: refs/heads/TEZ-3334 2d730ebca -> aa6ec595b
TEZ-3412. Modify ShuffleHandler to use Constants.DAG_PREFIX and fix AttemptPathIdentifier#toString() (Kuhu Shukla via jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/aa6ec595 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/aa6ec595 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/aa6ec595 Branch: refs/heads/TEZ-3334 Commit: aa6ec595be9a2e4a876b8e352771e09a7b241e4c Parents: 2d730eb Author: Jonathan Eagles <[email protected]> Authored: Fri Aug 12 17:43:03 2016 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Fri Aug 12 17:43:03 2016 -0500 ---------------------------------------------------------------------- TEZ-3334-CHANGES.txt | 1 + .../main/java/org/apache/tez/auxservices/ShuffleHandler.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/aa6ec595/TEZ-3334-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-3334-CHANGES.txt b/TEZ-3334-CHANGES.txt index 3572a80..0628633 100644 --- a/TEZ-3334-CHANGES.txt +++ b/TEZ-3334-CHANGES.txt @@ -4,6 +4,7 @@ Apache Tez Change Log INCOMPATIBLE CHANGES: ALL CHANGES: + TEZ-3412. Modify ShuffleHandler to use Constants.DAG_PREFIX and fix AttemptPathIdentifier#toString() TEZ-3410. ShuffleHandler should use Path.SEPARATOR instead "/" TEZ-3408. Allow Task Output Files to reside in DAG specific directories for Custom Shuffle Handler TEZ-3238. Shuffle service name should be configureable and should not be hardcoded to âmapreduce_shuffleâ http://git-wip-us.apache.org/repos/asf/tez/blob/aa6ec595/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java index 873a171..b00c28f 100644 --- a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java +++ b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java @@ -68,6 +68,7 @@ import org.apache.hadoop.mapreduce.JobID; import org.apache.tez.mapreduce.hadoop.MRConfig; import org.apache.tez.common.security.JobTokenIdentifier; import org.apache.tez.common.security.JobTokenSecretManager; +import org.apache.tez.runtime.library.common.Constants; import org.apache.tez.runtime.library.common.security.SecureShuffleUtils; import org.apache.tez.runtime.library.common.shuffle.orderedgrouped.ShuffleHeader; import org.apache.hadoop.metrics2.MetricsSystem; @@ -1056,8 +1057,8 @@ public class ShuffleHandler extends AuxiliaryService { final String baseStr = USERCACHE + Path.SEPARATOR + user + Path.SEPARATOR + APPCACHE + Path.SEPARATOR - + appID.toString() + Path.SEPARATOR + "dag_" + dagId + - Path.SEPARATOR + "output" + Path.SEPARATOR; + + appID.toString() + Path.SEPARATOR + Constants.DAG_PREFIX + + dagId + Path.SEPARATOR + "output" + Path.SEPARATOR; return baseStr; } @@ -1354,7 +1355,7 @@ public class ShuffleHandler extends AuxiliaryService { public String toString() { return "AttemptPathIdentifier{" + "jobId='" + jobId + '\'' + - ", dagId=" + dagId + + ", dagId='" + dagId + '\'' + ", user='" + user + '\'' + ", attemptId='" + attemptId + '\'' + '}';
