You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2016/12/05 17:44:47 UTC
tez git commit: TEZ-3507. Task logs link when editing url from one
task to another (jeagles)
Repository: tez
Updated Branches:
refs/heads/branch-0.8 e06a7f47a -> 57b8eb5df
TEZ-3507. Task logs link when editing url from one task to another (jeagles)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/57b8eb5d
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/57b8eb5d
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/57b8eb5d
Branch: refs/heads/branch-0.8
Commit: 57b8eb5df629341d76cf71b6567366e1d521f063
Parents: e06a7f4
Author: Jonathan Eagles <je...@yahoo-inc.com>
Authored: Mon Dec 5 11:44:29 2016 -0600
Committer: Jonathan Eagles <je...@yahoo-inc.com>
Committed: Mon Dec 5 11:44:29 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
tez-ui/src/main/webapp/app/scripts/helpers/misc.js | 2 +-
.../webapp/app/templates/components/basic-table/logs-cell.hbs | 6 +++---
tez-ui/src/main/webapp/app/templates/dag/index.hbs | 6 +++---
tez-ui/src/main/webapp/app/templates/task/index.hbs | 4 ++--
tez-ui/src/main/webapp/app/templates/taskAttempt/index.hbs | 4 ++--
tez-ui/src/main/webapp/app/templates/tez-app/index.hbs | 2 +-
tez-ui/src/main/webapp/app/templates/vertex/index.hbs | 6 +++---
8 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/57b8eb5d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2686544..33d709e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-3507. Task logs link when editing url from one task to another.
TEZ-3536. NPE in WebUIService start when host resolution fails.
TEZ-3534. Differentiate thread names on Fetchers, minor changes to shuffle shutdown code.
TEZ-3491. Tez job can hang due to container priority inversion.
http://git-wip-us.apache.org/repos/asf/tez/blob/57b8eb5d/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
index 6f091ee..04e3db2 100644
--- a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
+++ b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
@@ -694,7 +694,7 @@ App.Helpers.misc = {
if(!link.match("/syslog_")) {
path = "/syslog_" + attempt.get('id');
}
- logLinks.viewUrl = App.Helpers.misc.modifyUrl(link, path, params, protocol);
+ logLinks.viewUrl = '//' + App.Helpers.misc.modifyUrl(link, path, params, protocol);
}
link = attempt.get('completedLog');
http://git-wip-us.apache.org/repos/asf/tez/blob/57b8eb5d/tez-ui/src/main/webapp/app/templates/components/basic-table/logs-cell.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/components/basic-table/logs-cell.hbs b/tez-ui/src/main/webapp/app/templates/components/basic-table/logs-cell.hbs
index c46cc13..cba8a4a 100644
--- a/tez-ui/src/main/webapp/app/templates/components/basic-table/logs-cell.hbs
+++ b/tez-ui/src/main/webapp/app/templates/components/basic-table/logs-cell.hbs
@@ -20,12 +20,12 @@
<i class="waiting"></i>
{{else}}
{{#if view.cellContent.viewUrl}}
- <a target="_blank" href="{{unbound view.cellContent.viewUrl}}">View</a>
+ <a target="_blank" {{bind-attr href='view.cellContent.viewUrl'}}>View</a>
{{/if}}
{{#if view.cellContent.downloadUrl}}
- <a target="_blank" href="{{unbound view.cellContent.downloadUrl}}" download type="application/octet-stream">Download</a>
+ <a target="_blank" {{bind-attr href='view.cellContent.downloadUrl'}} download type="application/octet-stream">Download</a>
{{else}}{{#unless view.cellContent.viewUrl}}
<span class="message">Not Available!</span>
{{/unless}}{{/if}}
-{{/if}}
\ No newline at end of file
+{{/if}}
http://git-wip-us.apache.org/repos/asf/tez/blob/57b8eb5d/tez-ui/src/main/webapp/app/templates/dag/index.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/dag/index.hbs b/tez-ui/src/main/webapp/app/templates/dag/index.hbs
index c287584..74781ca 100644
--- a/tez-ui/src/main/webapp/app/templates/dag/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dag/index.hbs
@@ -61,10 +61,10 @@
<i {{bind-attr class=':task-status taskIconStatus'}}></i> {{status}}
{{#if progressStr}} {{bs-badge content=progressStr}}{{/if}}
{{#if hasFailedTasks}}
- [ <a href='{{unbound failedTasksLink}}'>Failed Tasks</a> ]
+ [ <a {{bind-attr href='failedTasksLink'}}>Failed Tasks</a> ]
{{/if}}
{{#if hasFailedTaskAttempts}}
- [ <a href='{{unbound failedTaskAttemptsLink}}'>Failed TaskAttempts</a> ]
+ [ <a {{bind-attr href='failedTaskAttemptsLink'}}>Failed TaskAttempts</a> ]
{{/if}}
</td>
</tr>
@@ -84,7 +84,7 @@
<td>Logs</td>
<td>
{{#each log in containerLogs}}
- <a target="_blank" a href='{{unbound log.containerLog}}'>{{log.id}}</a>
+ <a target="_blank" a {{bind-attr href='log.containerLog'}}>{{log.id}}</a>
{{else}}
<span class="message">Not Available!</span>
{{/each}}
http://git-wip-us.apache.org/repos/asf/tez/blob/57b8eb5d/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 09cd986..13e97f3 100644
--- a/tez-ui/src/main/webapp/app/templates/task/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/task/index.hbs
@@ -68,11 +68,11 @@
<td>Logs</td>
<td>
{{#if logsLink.viewUrl}}
- <a target="_blank" href='//{{unbound logsLink.viewUrl}}'>View</a>
+ <a target="_blank" {{bind-attr href="logsLink.viewUrl"}}>View</a>
{{/if}}
{{#if logsLink.downloadUrl}}
- <a target="_blank" href='{{unbound logsLink.downloadUrl}}' download type="application/octet-stream">Download</a>
+ <a target="_blank" {{bind-attr href="logsLink.downloadUrl"}} download type="application/octet-stream">Download</a>
{{/if}}
{{#unless logsLink.viewUrl}}
{{#unless logsLink.downloadUrl}}
http://git-wip-us.apache.org/repos/asf/tez/blob/57b8eb5d/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 e1c60d1..ff3003a 100644
--- a/tez-ui/src/main/webapp/app/templates/taskAttempt/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/taskAttempt/index.hbs
@@ -76,11 +76,11 @@
<td>Logs</td>
<td>
{{#if logsLink.viewUrl}}
- <a target="_blank" href='//{{unbound logsLink.viewUrl}}'>View</a>
+ <a target="_blank" {{bind-attr href="logsLink.viewUrl"}}>View</a>
{{/if}}
{{#if logsLink.downloadUrl}}
- <a target="_blank" href='{{unbound logsLink.downloadUrl}}' download type="application/octet-stream">Download</a>
+ <a target="_blank" {{bind-attr href="logsLink.downloadUrl"}} download type="application/octet-stream">Download</a>
{{/if}}
{{#unless logsLink.viewUrl}}
{{#unless logsLink.downloadUrl}}
http://git-wip-us.apache.org/repos/asf/tez/blob/57b8eb5d/tez-ui/src/main/webapp/app/templates/tez-app/index.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/tez-app/index.hbs b/tez-ui/src/main/webapp/app/templates/tez-app/index.hbs
index ff87fbc..aca483e 100644
--- a/tez-ui/src/main/webapp/app/templates/tez-app/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/tez-app/index.hbs
@@ -34,7 +34,7 @@
<tbody>
<tr>
<td>Application Tracking URL</td>
- <td><a target="_blank" {{bind-attr href=rmTrackingURL}}>{{unbound appId}}</a></td>
+ <td><a target="_blank" {{bind-attr href=rmTrackingURL}}>{{appId}}</a></td>
</tr>
{{#if appDetail}}
<tr>
http://git-wip-us.apache.org/repos/asf/tez/blob/57b8eb5d/tez-ui/src/main/webapp/app/templates/vertex/index.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/vertex/index.hbs b/tez-ui/src/main/webapp/app/templates/vertex/index.hbs
index 96e82fc..311493f 100644
--- a/tez-ui/src/main/webapp/app/templates/vertex/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/vertex/index.hbs
@@ -66,10 +66,10 @@
{{status}}
{{#if progressStr}} {{bs-badge content=progressStr}}{{/if}}
{{#if hasFailedTasks}}
- [ <a href='{{unbound failedTasksLink}}'>Failed Tasks</a> ]
+ [ <a {{bind-attr href='failedTasksLink'}}>Failed Tasks</a> ]
{{/if}}
{{#if hasFailedTaskAttempts}}
- [ <a href='{{unbound failedTaskAttemptsLink}}'>Failed TaskAttempts</a> ]
+ [ <a {{bind-attr href='failedTaskAttemptsLink'}}>Failed TaskAttempts</a> ]
{{/if}}
</td>
</tr>
@@ -147,7 +147,7 @@
<td>
{{failedTasks}}
{{#if hasFailedTasks}}
- <a href='{{unbound failedTasksLink}}'>FailedTasks</a>
+ <a {{bind-attr href='failedTasksLink'}}>FailedTasks</a>
{{/if}}
</td>
</tr>