You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2019/03/15 00:48:54 UTC
[hive] branch master updated: HIVE-21435: LlapBaseInputFormat
should get task number from TASK_ATTEMPT_ID conf if present,
while building SubmitWorkRequestProto (Shubham Chaurasia,
reviewed by Jason Dere)
This is an automated email from the ASF dual-hosted git repository.
jdere pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 3f02ce4 HIVE-21435: LlapBaseInputFormat should get task number from TASK_ATTEMPT_ID conf if present, while building SubmitWorkRequestProto (Shubham Chaurasia, reviewed by Jason Dere)
3f02ce4 is described below
commit 3f02ce42683994f04f76e9e28f47027ae04be13e
Author: Shubham Chaurasia <sc...@cloudera.com>
AuthorDate: Thu Mar 14 17:48:06 2019 -0700
HIVE-21435: LlapBaseInputFormat should get task number from TASK_ATTEMPT_ID conf if present, while building SubmitWorkRequestProto (Shubham Chaurasia, reviewed by Jason Dere)
---
.../org/apache/hadoop/hive/llap/LlapBaseInputFormat.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java b/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java
index 30f3720..ff91f47 100644
--- a/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java
+++ b/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java
@@ -171,18 +171,22 @@ public class LlapBaseInputFormat<V extends WritableComparable<?>>
submitWorkInfo.getToken(), umbilicalResponder, llapToken);
int attemptNum = 0;
- // Use task attempt number from conf if provided
+ final int taskNum;
+ // Use task attempt number, task number from conf if provided
TaskAttemptID taskAttemptId = TaskAttemptID.forName(job.get(MRJobConfig.TASK_ATTEMPT_ID));
if (taskAttemptId != null) {
attemptNum = taskAttemptId.getId();
+ taskNum = taskAttemptId.getTaskID().getId();
if (LOG.isDebugEnabled()) {
- LOG.debug("Setting attempt number to " + attemptNum + " from task attempt ID in conf: " +
- job.get(MRJobConfig.TASK_ATTEMPT_ID));
+ LOG.debug("Setting attempt number to: {}, task number to: {} from given taskAttemptId: {} in conf",
+ attemptNum, taskNum, taskAttemptId);
}
+ } else {
+ taskNum = llapSplit.getSplitNum();
}
SubmitWorkRequestProto request = constructSubmitWorkRequestProto(
- submitWorkInfo, llapSplit.getSplitNum(), attemptNum, llapClient.getAddress(),
+ submitWorkInfo, taskNum, attemptNum, llapClient.getAddress(),
submitWorkInfo.getToken(), llapSplit.getFragmentBytes(),
llapSplit.getFragmentBytesSignature(), job);
llapClient.submitWork(request, host, llapSubmitPort);