big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-6364. Add a Kill link to Task Attempts page. Contributed by Ryu Kobayashi.

Browse Source
This commit is contained in:
Tsuyoshi Ozawa 2015-05-26 23:59:02 +09:00
parent 9a3d617b63
commit 022f49d59e
4 changed files with 85 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -267,6 +267,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-6284. Add Task Attempt State API to MapReduce Application
Master REST API. (Ryu Kobayashi via ozawa)
MAPREDUCE-6364. Add a "Kill" link to Task Attempts page. (Ryu Kobayashi
via ozawa)
IMPROVEMENTS
MAPREDUCE-6291. Correct mapred queue usage command.

5
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AttemptsPage.java
View File

@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.v2.api.records.TaskAttemptId;
import org.apache.hadoop.mapreduce.v2.api.records.TaskAttemptState;
import org.apache.hadoop.mapreduce.v2.api.records.TaskType;
@ -40,8 +41,8 @@
public class AttemptsPage extends TaskPage {
static class FewAttemptsBlock extends TaskPage.AttemptsBlock {
@Inject
FewAttemptsBlock(App ctx) {
super(ctx);
FewAttemptsBlock(App ctx, Configuration conf) {
super(ctx, conf);
}
@Override

73
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
View File

@ -27,6 +27,8 @@
import java.util.Collection;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.MRConfig;
import org.apache.hadoop.mapreduce.v2.app.job.TaskAttempt;
import org.apache.hadoop.mapreduce.v2.app.webapp.dao.TaskAttemptInfo;
import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil;
@ -35,6 +37,8 @@
import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE;
import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY;
import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.THEAD;
import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TR;
import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
import com.google.inject.Inject;
@ -43,10 +47,15 @@ public class TaskPage extends AppView {
static class AttemptsBlock extends HtmlBlock {
final App app;
final boolean enableUIActions;
private String stateURLFormat;
@Inject
AttemptsBlock(App ctx) {
AttemptsBlock(App ctx, Configuration conf) {
app = ctx;
this.enableUIActions =
conf.getBoolean(MRConfig.MASTER_WEBAPP_UI_ACTIONS_ENABLED,
MRConfig.DEFAULT_MASTER_WEBAPP_UI_ACTIONS_ENABLED);
}
@Override
@ -56,11 +65,44 @@ protected void render(Block html) {
h2($(TITLE));
return;
}
TBODY<TABLE<Hamlet>> tbody = html.
table("#attempts").
thead().
tr().
th(".id", "Attempt").
if (enableUIActions) {
// Kill task attempt
String appID = app.getJob().getID().getAppId().toString();
String jobID = app.getJob().getID().toString();
String taskID = app.getTask().getID().toString();
stateURLFormat =
String.format("/proxy/%s/ws/v1/mapreduce/jobs/%s/tasks/%s/"
+ "attempts", appID, jobID, taskID) + "/%s/state";
String current =
String.format("/proxy/%s/mapreduce/task/%s", appID, taskID);
StringBuilder script = new StringBuilder();
script.append("function confirmAction(stateURL) {")
.append(" b = confirm(\"Are you sure?\");")
.append(" if (b == true) {")
.append(" $.ajax({")
.append(" type: 'PUT',")
.append(" url: stateURL,")
.append(" contentType: 'application/json',")
.append(" data: '{\"state\":\"KILLED\"}',")
.append(" dataType: 'json'")
.append(" }).done(function(data){")
.append(" setTimeout(function(){")
.append(" location.href = '").append(current).append("';")
.append(" }, 1000);")
.append(" }).fail(function(data){")
.append(" console.log(data);")
.append(" });")
.append(" }")
.append("}");
html.script().$type("text/javascript")._(script.toString())._();
}
TR<THEAD<TABLE<Hamlet>>> tr = html.table("#attempts").thead().tr();
tr.th(".id", "Attempt").
th(".progress", "Progress").
th(".state", "State").
th(".status", "Status").
@ -69,8 +111,12 @@ protected void render(Block html) {
th(".tsh", "Started").
th(".tsh", "Finished").
th(".tsh", "Elapsed").
th(".note", "Note")._()._().
tbody();
th(".note", "Note");
if (enableUIActions) {
tr.th(".actions", "Actions");
}
TBODY<TABLE<Hamlet>> tbody = tr._()._().tbody();
// Write all the data into a JavaScript array of arrays for JQuery
// DataTables to display
StringBuilder attemptsTableData = new StringBuilder("[\n");
@ -103,7 +149,16 @@ protected void render(Block html) {
.append(ta.getFinishTime()).append("\",\"")
.append(ta.getElapsedTime()).append("\",\"")
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
diag))).append("\"],\n");
diag)));
if (enableUIActions) {
attemptsTableData.append("\",\"")
.append("<a href=javascript:void(0) onclick=confirmAction('")
.append(String.format(stateURLFormat, ta.getId()))
.append("');>Kill</a>")
.append("\"],\n");
} else {
attemptsTableData.append("\"],\n");
}
}
//Remove the last comma and close off the array of arrays
if(attemptsTableData.charAt(attemptsTableData.length() - 2) == ',') {

7
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRConfig.java
View File

@ -124,5 +124,12 @@ public interface MRConfig {
@Unstable
public static final boolean DEFAULT_MAPREDUCE_APP_SUBMISSION_CROSS_PLATFORM =
false;
/**
* Enable application master webapp ui actions.
*/
String MASTER_WEBAPP_UI_ACTIONS_ENABLED =
"mapreduce.webapp.ui-actions.enabled";
boolean DEFAULT_MASTER_WEBAPP_UI_ACTIONS_ENABLED = true;
}