Repository: hive Updated Branches: refs/heads/llap ce2af3d52 -> 6eb1f55c1
HIVE-10886. LLAP: Fixes to TaskReporter after recent Tez changes. (Siddharth Seth) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6eb1f55c Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6eb1f55c Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6eb1f55c Branch: refs/heads/llap Commit: 6eb1f55c14c62e49700305f80305902be155b9d7 Parents: ce2af3d Author: Siddharth Seth <ss...@apache.org> Authored: Mon Jun 1 16:49:01 2015 -0700 Committer: Siddharth Seth <ss...@apache.org> Committed: Mon Jun 1 16:49:01 2015 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/6eb1f55c/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java index 716fb23..fc66254 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java @@ -253,8 +253,9 @@ public class LlapTaskReporter implements TaskReporterInterface { long requestId = requestCounter.incrementAndGet(); int fromEventId = task.getNextFromEventId(); - TezHeartbeatRequest request = new TezHeartbeatRequest(requestId, events, containerIdStr, - task.getTaskAttemptID(), fromEventId, maxEventsToGet); + int fromPreRoutedEventId = task.getNextPreRoutedEventId(); + TezHeartbeatRequest request = new TezHeartbeatRequest(requestId, events, fromPreRoutedEventId, + containerIdStr, task.getTaskAttemptID(), fromEventId, maxEventsToGet); if (LOG.isDebugEnabled()) { LOG.debug("Sending heartbeat to AM, request=" + request); } @@ -286,6 +287,7 @@ public class LlapTaskReporter implements TaskReporterInterface { } } else { task.setNextFromEventId(response.getNextFromEventId()); + task.setNextPreRoutedEventId(response.getNextPreRoutedEventId()); if (response.getEvents() != null && !response.getEvents().isEmpty()) { if (LOG.isDebugEnabled()) { LOG.debug("Routing events from heartbeat response to task" + ", currentTaskAttemptId="
