Repository: tez
Updated Branches:
refs/heads/master 6930e4baf -> 7ed7025ad
Revert "TEZ-2840. MRInputLegacy.init should set splitInfoViaEvents. (Sergey
Shelukhin via hitesh)"
This reverts commit 6af43ce40f77fa1fb1f551f3a7cf5251654c710f.
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/7ed7025a
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/7ed7025a
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/7ed7025a
Branch: refs/heads/master
Commit: 7ed7025ad32b71c9f0df2cbc85eba18daf30c337
Parents: 6930e4b
Author: Siddharth Seth <[email protected]>
Authored: Fri Sep 18 16:05:29 2015 -0700
Committer: Siddharth Seth <[email protected]>
Committed: Fri Sep 18 16:05:29 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 --
.../main/java/org/apache/tez/mapreduce/input/MRInput.java | 8 ++++----
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/7ed7025a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f62b64e..0e93702 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,7 +11,6 @@ ALL CHANGES:
TEZ-2812. Preemption sometimes does not respect heartbeats between
preemptions
TEZ-814. Improve heuristic for determining a task has failed outputs
TEZ-2832. Support tests for both SimpleHistory logging and ATS logging
- TEZ-2840. MRInputLegacy.init should set splitInfoViaEvents.
TEZ-2827. Increase timeout for TestFetcher testInputAttemptIdentifierMap
TEZ-2774. Improvements and cleanup of logging for the AM and parts of the
runtme.
TEZ-2825. Report progress in terms of completed tasks to reduce load on AM
for Tez UI
@@ -189,7 +188,6 @@ ALL CHANGES:
TEZ-2097. TEZ-UI Add dag logs backend support
TEZ-2812. Preemption sometimes does not respect heartbeats between
preemptions
TEZ-814. Improve heuristic for determining a task has failed outputs
- TEZ-2840. MRInputLegacy.init should set splitInfoViaEvents.
TEZ-2829. Tez UI: minor fixes to in-progress update of UI from AM
TEZ-2663. SessionNotRunning exceptions are wrapped in a ServiceException
from a dying AM.
TEZ-2825. Report progress in terms of completed tasks to reduce load on AM
for Tez UI
http://git-wip-us.apache.org/repos/asf/tez/blob/7ed7025a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
----------------------------------------------------------------------
diff --git
a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
index f3dcb42..70365cd 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
@@ -435,6 +435,10 @@ public class MRInput extends MRInputBase {
public List<Event> initialize() throws IOException {
super.initialize();
getContext().inputIsReady();
+ this.splitInfoViaEvents =
jobConf.getBoolean(MRJobConfig.MR_TEZ_SPLITS_VIA_EVENTS,
+ MRJobConfig.MR_TEZ_SPLITS_VIA_EVENTS_DEFAULT);
+ LOG.info("Using New mapreduce API: " + useNewApi
+ + ", split information via event: " + splitInfoViaEvents);
initializeInternal();
return null;
}
@@ -448,10 +452,6 @@ public class MRInput extends MRInputBase {
@Private
void initializeInternal() throws IOException {
- this.splitInfoViaEvents =
jobConf.getBoolean(MRJobConfig.MR_TEZ_SPLITS_VIA_EVENTS,
- MRJobConfig.MR_TEZ_SPLITS_VIA_EVENTS_DEFAULT);
- LOG.info("Using New mapreduce API: " + useNewApi
- + ", split information via event: " + splitInfoViaEvents);
// Primarily for visibility
rrLock.lock();
try {
