Repository: tez Updated Branches: refs/heads/master e84d79725 -> fccb6f127
TEZ-2828. Fix typo in "Shuffle assigned " log statement in shuffle.orderedgrouped.Shuffle. (Johannes Zillmann via hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/fccb6f12 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/fccb6f12 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/fccb6f12 Branch: refs/heads/master Commit: fccb6f1277e57ee5f4df34af664be7354344bf1c Parents: e84d797 Author: Hitesh Shah <[email protected]> Authored: Tue Nov 3 16:08:43 2015 -0800 Committer: Hitesh Shah <[email protected]> Committed: Tue Nov 3 16:08:43 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../runtime/library/common/shuffle/orderedgrouped/Shuffle.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/fccb6f12/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 559d748..8234e70 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES TEZ-2679. Admin forms of launch env settings ALL CHANGES: + TEZ-2828. Fix typo in "Shuffle assigned " log statement in shuffle.orderedgrouped.Shuffle. TEZ-2909. Tez UI: Application link in All DAGs table is disable when applicationhistory is unavailable TEZ-808. Handle task attempts that are not making progress TEZ-2553. Tez UI: Tez UI Nits @@ -233,6 +234,7 @@ INCOMPATIBLE CHANGES TEZ-2679. Admin forms of launch env settings ALL CHANGES + TEZ-2828. Fix typo in "Shuffle assigned " log statement in shuffle.orderedgrouped.Shuffle. TEZ-2900. Ignore V_INPUT_DATA_INFORMATION when vertex is in Failed/Killed/Error TEZ-2904. Pig can't specify task specific command opts TEZ-2899. Tez UI: DAG getting created with huge horizontal gap in between vertices http://git-wip-us.apache.org/repos/asf/tez/blob/fccb6f12/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java index 0e1fe9f..b5dcd4c 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java @@ -145,8 +145,8 @@ public class Shuffle implements ExceptionReporter { inputContext.getCounters().findCounter(TaskCounter.MERGED_MAP_OUTPUTS); LOG.info(srcNameTrimmed + ": " + "Shuffle assigned with " + numInputs + " inputs" + ", codec: " - + (codec == null ? "None" : codec.getClass().getName()) + - "ifileReadAhead: " + ifileReadAhead); + + (codec == null ? "None" : codec.getClass().getName()) + + ", ifileReadAhead: " + ifileReadAhead); boolean sslShuffle = conf.getBoolean(TezRuntimeConfiguration.TEZ_RUNTIME_SHUFFLE_ENABLE_SSL, TezRuntimeConfiguration.TEZ_RUNTIME_SHUFFLE_ENABLE_SSL_DEFAULT);
