MAPREDUCE-6297. Task Id of the failed task in diagnostics should link to the task page. (Siqi Li via gera)
This commit is contained in:
Gera Shegalov
parent
6d2cf9fbbd
commit
89ded89e86
@ -340,6 +340,9 @@ Release 2.8.0 - UNRELEASED
|
||||
MAPREDUCE-6293. Set job classloader on uber-job's LocalContainerLauncher
|
||||
event thread. (Sangjin Lee via gera)
|
||||
|
||||
MAPREDUCE-6297. Task Id of the failed task in diagnostics should link to
|
||||
the task page. (Siqi Li via gera)
|
||||
|
||||
Release 2.7.1 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
@ -58,6 +60,9 @@
|
||||
public class TaskID extends org.apache.hadoop.mapred.ID {
|
||||
protected static final String TASK = "task";
|
||||
protected static final NumberFormat idFormat = NumberFormat.getInstance();
|
||||
public static final String TASK_ID_REGEX = TASK + "_(\\d+)_(\\d+)_" +
|
||||
CharTaskTypeMaps.allTaskTypes + "_(\\d+)";
|
||||
public static final Pattern taskIdPattern = Pattern.compile(TASK_ID_REGEX);
|
||||
static {
|
||||
idFormat.setGroupingUsed(false);
|
||||
idFormat.setMinimumIntegerDigits(6);
|
||||
@ -207,29 +212,15 @@ public static TaskID forName(String str)
|
||||
throws IllegalArgumentException {
|
||||
if(str == null)
|
||||
return null;
|
||||
String exceptionMsg = null;
|
||||
try {
|
||||
String[] parts = str.split("_");
|
||||
if(parts.length == 5) {
|
||||
if(parts[0].equals(TASK)) {
|
||||
String type = parts[3];
|
||||
TaskType t = CharTaskTypeMaps.getTaskType(type.charAt(0));
|
||||
if(t != null) {
|
||||
|
||||
return new org.apache.hadoop.mapred.TaskID(parts[1],
|
||||
Integer.parseInt(parts[2]),
|
||||
t,
|
||||
Integer.parseInt(parts[4]));
|
||||
} else
|
||||
exceptionMsg = "Bad TaskType identifier. TaskId string : " + str
|
||||
+ " is not properly formed.";
|
||||
}
|
||||
}
|
||||
}catch (Exception ex) {//fall below
|
||||
}
|
||||
if (exceptionMsg == null) {
|
||||
exceptionMsg = "TaskId string : " + str + " is not properly formed";
|
||||
Matcher m = taskIdPattern.matcher(str);
|
||||
if (m.matches()) {
|
||||
return new org.apache.hadoop.mapred.TaskID(m.group(1),
|
||||
Integer.parseInt(m.group(2)),
|
||||
CharTaskTypeMaps.getTaskType(m.group(3).charAt(0)),
|
||||
Integer.parseInt(m.group(4)));
|
||||
}
|
||||
String exceptionMsg = "TaskId string : " + str + " is not properly formed" +
|
||||
"\nReason: " + m.toString();
|
||||
throw new IllegalArgumentException(exceptionMsg);
|
||||
}
|
||||
/**
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.hadoop.mapreduce.TaskID;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.AMInfo;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.JobId;
|
||||
import org.apache.hadoop.mapreduce.v2.app.AppContext;
|
||||
@ -98,7 +99,7 @@ public class HsJobBlock extends HtmlBlock {
|
||||
if(diagnostics != null && !diagnostics.isEmpty()) {
|
||||
StringBuffer b = new StringBuffer();
|
||||
for(String diag: diagnostics) {
|
||||
b.append(diag);
|
||||
b.append(addTaskLinks(diag));
|
||||
}
|
||||
infoBlock._("Diagnostics:", b.toString());
|
||||
}
|
||||
@ -203,4 +204,9 @@ public class HsJobBlock extends HtmlBlock {
|
||||
_().
|
||||
_();
|
||||
}
|
||||
|
||||
static String addTaskLinks(String text) {
|
||||
return TaskID.taskIdPattern.matcher(text).replaceAll(
|
||||
"<a href=\"/jobhistory/task/$0\">$0</a>");
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,6 +65,7 @@
|
||||
import org.apache.hadoop.yarn.webapp.view.BlockForTest;
|
||||
import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
|
||||
import org.apache.hadoop.yarn.webapp.view.HtmlBlock.Block;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
@ -78,6 +79,23 @@
|
||||
public class TestBlocks {
|
||||
private ByteArrayOutputStream data = new ByteArrayOutputStream();
|
||||
|
||||
@Test
|
||||
public void testPullTaskLink(){
|
||||
Task task = getTask(0);
|
||||
String taskId = task.getID().toString();
|
||||
|
||||
Assert.assertEquals("pull links doesn't work correctly",
|
||||
"Task failed <a href=\"/jobhistory/task/" + taskId + "\">" +
|
||||
taskId + "</a>"
|
||||
, HsJobBlock.addTaskLinks("Task failed " + taskId));
|
||||
|
||||
Assert.assertEquals("pull links doesn't work correctly",
|
||||
"Task failed <a href=\"/jobhistory/task/" + taskId + "\">" +
|
||||
taskId + "</a>\n Job failed as tasks failed. failedMaps:1 failedReduces:0"
|
||||
, HsJobBlock.addTaskLinks("Task failed " + taskId + "\n " +
|
||||
"Job failed as tasks failed. failedMaps:1 failedReduces:0"));
|
||||
}
|
||||
|
||||
/**
|
||||
* test HsTasksBlock's rendering.
|
||||
*/
|
||||
@ -241,7 +259,7 @@ public void testHsController() throws Exception {
|
||||
assertEquals(HsAttemptsPage.class, controller.attemptsPage());
|
||||
|
||||
controller.set(AMParams.JOB_ID, "job_01_01");
|
||||
controller.set(AMParams.TASK_ID, "task_01_01_m01_01");
|
||||
controller.set(AMParams.TASK_ID, "task_01_01_m_01");
|
||||
controller.set(AMParams.TASK_TYPE, "m");
|
||||
controller.set(AMParams.ATTEMPT_STATE, "State");
|
||||
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.mapreduce.TaskID;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.JobId;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.TaskId;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.TaskReport;
|
||||
@ -368,9 +369,11 @@ public void testTaskIdBogus() throws JSONException, Exception {
|
||||
String message = exception.getString("message");
|
||||
String type = exception.getString("exception");
|
||||
String classname = exception.getString("javaClassName");
|
||||
WebServicesTestUtils.checkStringMatch("exception message",
|
||||
WebServicesTestUtils.checkStringEqual("exception message",
|
||||
"java.lang.Exception: TaskId string : "
|
||||
+ "bogustaskid is not properly formed", message);
|
||||
+ "bogustaskid is not properly formed"
|
||||
+ "\nReason: java.util.regex.Matcher[pattern=" +
|
||||
TaskID.TASK_ID_REGEX + " region=0,11 lastmatch=]", message);
|
||||
WebServicesTestUtils.checkStringMatch("exception type",
|
||||
"NotFoundException", type);
|
||||
WebServicesTestUtils.checkStringMatch("exception classname",
|
||||
@ -432,9 +435,11 @@ public void testTaskIdInvalid() throws JSONException, Exception {
|
||||
String message = exception.getString("message");
|
||||
String type = exception.getString("exception");
|
||||
String classname = exception.getString("javaClassName");
|
||||
WebServicesTestUtils.checkStringMatch("exception message",
|
||||
"java.lang.Exception: Bad TaskType identifier. TaskId string : "
|
||||
+ "task_0_0000_d_000000 is not properly formed.", message);
|
||||
WebServicesTestUtils.checkStringEqual("exception message",
|
||||
"java.lang.Exception: TaskId string : "
|
||||
+ "task_0_0000_d_000000 is not properly formed" +
|
||||
"\nReason: java.util.regex.Matcher[pattern=" +
|
||||
TaskID.TASK_ID_REGEX + " region=0,20 lastmatch=]", message);
|
||||
WebServicesTestUtils.checkStringMatch("exception type",
|
||||
"NotFoundException", type);
|
||||
WebServicesTestUtils.checkStringMatch("exception classname",
|
||||
@ -464,9 +469,11 @@ public void testTaskIdInvalid2() throws JSONException, Exception {
|
||||
String message = exception.getString("message");
|
||||
String type = exception.getString("exception");
|
||||
String classname = exception.getString("javaClassName");
|
||||
WebServicesTestUtils.checkStringMatch("exception message",
|
||||
WebServicesTestUtils.checkStringEqual("exception message",
|
||||
"java.lang.Exception: TaskId string : "
|
||||
+ "task_0000_m_000000 is not properly formed", message);
|
||||
+ "task_0000_m_000000 is not properly formed" +
|
||||
"\nReason: java.util.regex.Matcher[pattern=" +
|
||||
TaskID.TASK_ID_REGEX + " region=0,18 lastmatch=]", message);
|
||||
WebServicesTestUtils.checkStringMatch("exception type",
|
||||
"NotFoundException", type);
|
||||
WebServicesTestUtils.checkStringMatch("exception classname",
|
||||
@ -496,9 +503,11 @@ public void testTaskIdInvalid3() throws JSONException, Exception {
|
||||
String message = exception.getString("message");
|
||||
String type = exception.getString("exception");
|
||||
String classname = exception.getString("javaClassName");
|
||||
WebServicesTestUtils.checkStringMatch("exception message",
|
||||
WebServicesTestUtils.checkStringEqual("exception message",
|
||||
"java.lang.Exception: TaskId string : "
|
||||
+ "task_0_0000_m is not properly formed", message);
|
||||
+ "task_0_0000_m is not properly formed" +
|
||||
"\nReason: java.util.regex.Matcher[pattern=" +
|
||||
TaskID.TASK_ID_REGEX + " region=0,13 lastmatch=]", message);
|
||||
WebServicesTestUtils.checkStringMatch("exception type",
|
||||
"NotFoundException", type);
|
||||
WebServicesTestUtils.checkStringMatch("exception classname",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user