You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2015/02/11 21:19:59 UTC
[4/5] tez git commit: TEZ-2077. Tez UI: No diagnostics on Task
Attempt Details page if task attempt failed. (Prakash Ramachandran via
hitesh)
TEZ-2077. Tez UI: No diagnostics on Task Attempt Details page if task attempt failed. (Prakash Ramachandran via hitesh)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/96a61f88
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/96a61f88
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/96a61f88
Branch: refs/heads/master
Commit: 96a61f8878e92b50e66def75f24fa24cd9821b49
Parents: 668b94d
Author: Hitesh Shah <hi...@apache.org>
Authored: Wed Feb 11 11:59:53 2015 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Wed Feb 11 11:59:53 2015 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../app/scripts/models/TimelineRestAdapter.js | 19 ++++++++++---------
.../webapp/app/scripts/models/task_attempt.js | 10 ++++++----
tez-ui/src/main/webapp/app/styles/main.less | 4 ++++
.../src/main/webapp/app/templates/task/index.hbs | 2 +-
.../webapp/app/templates/taskAttempt/index.hbs | 2 +-
6 files changed, 23 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/96a61f88/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fe1a287..79674a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -61,6 +61,7 @@ Release 0.6.1: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-2077. Tez UI: No diagnostics on Task Attempt Details page if task attempt failed.
TEZ-2065. Setting up tez.tez-ui.history-url.base with a trailing slash can result in failures to redirect correctly.
TEZ-2068. Tez UI: Dag view should use full window height, disable webuiservice in localmode.
TEZ-2079. Tez UI: trailing slash in timelineBaseUrl in ui should be handled.
http://git-wip-us.apache.org/repos/asf/tez/blob/96a61f88/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js b/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
index 6e84648..ed524dd 100644
--- a/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
+++ b/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
@@ -117,7 +117,7 @@ var timelineJsonToDagMap = {
App.DagSerializer = App.TimelineSerializer.extend({
_normalizeSingleDagPayload: function(dag) {
- var normalizedCounterGroupData = this.normalizeCounterGroupsHelper('dag', dag.entity,
+ var normalizedCounterGroupData = this.normalizeCounterGroupsHelper('dag', dag.entity,
dag);
dag.counterGroups = normalizedCounterGroupData.counterGroupsIDs;
delete dag.otherinfo.counters;
@@ -144,7 +144,7 @@ App.DagSerializer = App.TimelineSerializer.extend({
[].push.apply(normalizedPayload.counterGroups, n.counterGroups);
[].push.apply(normalizedPayload.counters, n.counters);
}, this);
-
+
// delete so that we dont hang on to the json data.
delete rawPayload.dags;
@@ -174,12 +174,13 @@ var timelineJsonToTaskAttemptMap = {
vertexID: 'primaryfilters.TEZ_VERTEX_ID.0',
dagID: 'primaryfilters.TEZ_DAG_ID.0',
containerId: 'otherinfo.containerId',
- nodeId: 'otherinfo.nodeId'
+ nodeId: 'otherinfo.nodeId',
+ diagnostics: 'otherinfo.diagnostics'
};
App.TaskAttemptSerializer = App.TimelineSerializer.extend({
_normalizeSingleTaskAttemptPayload: function(taskAttempt) {
- var normalizedCounterGroupData = this.normalizeCounterGroupsHelper('taskAttempt',
+ var normalizedCounterGroupData = this.normalizeCounterGroupsHelper('taskAttempt',
taskAttempt.entity, taskAttempt);
taskAttempt.counterGroups = normalizedCounterGroupData.counterGroupsIDs;
delete taskAttempt.otherinfo.counters;
@@ -199,11 +200,11 @@ App.TaskAttemptSerializer = App.TimelineSerializer.extend({
};
rawPayload.taskAttempts.forEach(function(taskAttempt){
var n = this._normalizeSingleTaskAttemptPayload(taskAttempt);
- normalizedPayload.taskAttempts.push(n.taskAttempt);
+ normalizedPayload.taskAttempts.push(n.taskAttempt);
[].push.apply(normalizedPayload.counterGroups, n.counterGroups);
[].push.apply(normalizedPayload.counters, n.counters);
}, this);
-
+
// delete so that we dont hang on to the json data.
delete rawPayload.taskAttempts;
return normalizedPayload;
@@ -234,7 +235,7 @@ var timelineJsonToTaskMap = {
App.TaskSerializer = App.TimelineSerializer.extend({
_normalizeSingleTaskPayload: function(task) {
- var normalizedCounterGroupData = this.normalizeCounterGroupsHelper('task', task.entity,
+ var normalizedCounterGroupData = this.normalizeCounterGroupsHelper('task', task.entity,
task);
task.counterGroups = normalizedCounterGroupData.counterGroupsIDs;
@@ -260,7 +261,7 @@ App.TaskSerializer = App.TimelineSerializer.extend({
[].push.apply(normalizedPayload.counterGroups, n.counterGroups);
[].push.apply(normalizedPayload.counters, n.counters);
}, this);
-
+
// delete so that we dont hang on to the json data.
delete rawPayload.tasks;
@@ -369,7 +370,7 @@ App.VertexSerializer = App.TimelineSerializer.extend({
[].push.apply(normalizedPayload.inputs, n.inputs);
[].push.apply(normalizedPayload.outputs, n.outputs);
}, this);
-
+
// delete so that we dont hang on to the json data.
delete rawPayload.vertices;
http://git-wip-us.apache.org/repos/asf/tez/blob/96a61f88/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js b/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js
index e526224..ccaa214 100644
--- a/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js
+++ b/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js
@@ -23,15 +23,15 @@ App.TaskAttempt = App.AbstractEntity.extend({
// end time of the entity
endTime: DS.attr('number'),
- entityType: App.EntityType.TASK_ATTEMPT,
+ entityType: App.EntityType.TASK_ATTEMPT,
- // container
- containerId: DS.attr('string'),
+ // container
+ containerId: DS.attr('string'),
nodeId: DS.attr('string'),
// status of the task attempt
- status: DS.attr('string'),
+ status: DS.attr('string'),
taskID: DS.attr('string'),
vertexID: DS.attr('string'),
@@ -40,5 +40,7 @@ App.TaskAttempt = App.AbstractEntity.extend({
inProgressLog: DS.attr('string'),
completedLog: DS.attr('string'),
+ diagnostics: DS.attr('string'),
+
counterGroups: DS.hasMany('counterGroup', { inverse: 'parent' })
});
http://git-wip-us.apache.org/repos/asf/tez/blob/96a61f88/tez-ui/src/main/webapp/app/styles/main.less
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/styles/main.less b/tez-ui/src/main/webapp/app/styles/main.less
index a5d1892..37251cc 100644
--- a/tez-ui/src/main/webapp/app/styles/main.less
+++ b/tez-ui/src/main/webapp/app/styles/main.less
@@ -233,6 +233,10 @@ body, html, body > .ember-view {
margin: 0px 15px;
}
+.margin-medium-vertical {
+ margin: 30px 0px;
+}
+
.type-table {
display: table;
}
http://git-wip-us.apache.org/repos/asf/tez/blob/96a61f88/tez-ui/src/main/webapp/app/templates/task/index.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/task/index.hbs b/tez-ui/src/main/webapp/app/templates/task/index.hbs
index a43792b..df4a5b1 100644
--- a/tez-ui/src/main/webapp/app/templates/task/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/task/index.hbs
@@ -51,7 +51,7 @@
</div>
{{#if diagnostics}}
- {{#bs-panel heading="Diagnostics" collapsible=false dismiss=false type='danger'}}
+ {{#bs-panel heading="Diagnostics" collapsible=false dismiss=false type='danger' class="margin-medium-vertical"}}
{{formatDiagnostics diagnostics}}
{{/bs-panel}}
{{/if}}
http://git-wip-us.apache.org/repos/asf/tez/blob/96a61f88/tez-ui/src/main/webapp/app/templates/taskAttempt/index.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/taskAttempt/index.hbs b/tez-ui/src/main/webapp/app/templates/taskAttempt/index.hbs
index d56aff4..92e0f13 100644
--- a/tez-ui/src/main/webapp/app/templates/taskAttempt/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/taskAttempt/index.hbs
@@ -59,7 +59,7 @@
</div>
{{#if diagnostics}}
- {{#bs-panel heading="Diagnostics" collapsible=false dismiss=false type='danger'}}
+ {{#bs-panel heading="Diagnostics" collapsible=false dismiss=false type='danger' class="margin-medium-vertical"}}
{{formatDiagnostics diagnostics}}
{{/bs-panel}}
{{/if}}
\ No newline at end of file