Repository: tez
Updated Branches:
refs/heads/branch-0.7 abedba228 -> 1e6e47a2f
Revert "TEZ-2840. MRInputLegacy.init should set splitInfoViaEvents. (Sergey
Shelukhin via hitesh)"
This reverts commit f14d5127f2393bd92b9b603831cc5d5e66edb384.
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/1e6e47a2
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/1e6e47a2
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/1e6e47a2
Branch: refs/heads/branch-0.7
Commit: 1e6e47a2f1415e03913fcb8c22854c55194ebcb1
Parents: abedba2
Author: Siddharth Seth <[email protected]>
Authored: Fri Sep 18 16:08:21 2015 -0700
Committer: Siddharth Seth <[email protected]>
Committed: Fri Sep 18 16:08:21 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 -
.../main/java/org/apache/tez/mapreduce/input/MRInput.java | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/1e6e47a2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7fd73f..c5f4735 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,7 +9,6 @@ ALL CHANGES:
TEZ-2812. Preemption sometimes does not respect heartbeats between
preemptions
TEZ-2097. TEZ-UI Add dag logs backend support
TEZ-814. Improve heuristic for determining a task has failed outputs
- TEZ-2840. MRInputLegacy.init should set splitInfoViaEvents.
TEZ-2830. Backport TEZ-2774 to branch-0.7. Improvements to logging in the AM
and part of the runtime.
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.
http://git-wip-us.apache.org/repos/asf/tez/blob/1e6e47a2/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 {
