You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by pr...@apache.org on 2020/04/15 08:21:01 UTC
[hadoop] branch trunk updated: YARN-10233. Fix YARN UI2 Daemon Logs
This is an automated email from the ASF dual-hosted git repository.
prabhujoseph pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 94f7470 YARN-10233. Fix YARN UI2 Daemon Logs
94f7470 is described below
commit 94f7470c71104af1871a22c34fbbce14a60c33ab
Author: Prabhu Joseph <pr...@apache.org>
AuthorDate: Wed Apr 15 13:39:33 2020 +0530
YARN-10233. Fix YARN UI2 Daemon Logs
Contributed by Akhil PB.
---
.../hadoop-yarn-ui/src/main/webapp/.gitignore | 1 +
.../src/main/webapp/app/models/yarn-rm-log.js | 3 ++-
.../src/main/webapp/app/serializers/yarn-rm-log.js | 28 ++++++++++++----------
.../src/main/webapp/app/templates/yarn-tools.hbs | 2 +-
.../app/templates/yarn-tools/yarn-rm-log.hbs | 10 ++++----
5 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore
index 338997f..082fb27 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore
@@ -2,3 +2,4 @@ tmp/
node_modules/
bower_components/
dist/
+node/
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-log.js
index 2b6febf..17adc9f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-log.js
@@ -19,5 +19,6 @@
import DS from 'ember-data';
export default DS.Model.extend({
- logfileName: DS.attr()
+ logFileName: DS.attr(),
+ logFileUrl: DS.attr()
});
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-log.js
index da834f1..900e0ff 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-log.js
@@ -19,8 +19,8 @@
import DS from 'ember-data';
export default DS.JSONAPISerializer.extend({
- normalizeResponse(store, primaryModelClass, payload, id, requestType) {
- const pattern = new RegExp('<A HREF="/logs/.+">', 'g');
+ normalizeResponse(store, primaryModelClass, payload) {
+ const pattern = new RegExp('<A HREF="/logs/.+">|<a href="/logs/.+">', 'g');
let fileNames = payload.match(pattern);
if (fileNames == null) {
@@ -29,16 +29,20 @@ export default DS.JSONAPISerializer.extend({
let logfileNames = [];
for (var i = 0; i < fileNames.length; i++) {
- var fileName = fileNames[i].match(/<A HREF="(\/logs\/.+)">/);
- if (fileName.length != null) {
- logfileNames.push({
- id: i,
- type: primaryModelClass.modelName,
- attributes: {
- logfileName: fileName[1]
- }
- });
- }
+ var fileNameMatch = fileNames[i].match(/<A HREF="(\/logs\/.+)">.+<\/A>|<a href="(\/logs\/.+)">.+<\/a>/);
+ var logFileUrl = fileNameMatch[1] || fileNameMatch[2];
+ var logFileName = logFileUrl.replace('logs', '').replace(/\//g, '');
+
+ if (fileNameMatch.length != null) {
+ logfileNames.push({
+ id: i,
+ type: primaryModelClass.modelName,
+ attributes: {
+ logFileUrl: logFileUrl,
+ logFileName: logFileName
+ }
+ });
+ }
}
return { data : logfileNames };
},
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs
index 3efcf57..2306e4b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs
@@ -52,7 +52,7 @@
{{/link-to}}
{{/link-to}}
{{#link-to 'yarn-tools.yarn-rm-log' tagName="li"}}
- {{#link-to 'yarn-tools.yarn-rm-log'}}YARN Daemon logs
+ {{#link-to 'yarn-tools.yarn-rm-log'}}YARN Daemon Logs
{{/link-to}}
{{/link-to}}
</ul>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-rm-log.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-rm-log.hbs
index 3cf536d..6d80246 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-rm-log.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-rm-log.hbs
@@ -17,15 +17,15 @@
}}
<h1>YARN Daemon Logs</h1>
-<div class="col-md-12 container-fluid">
- <div class="col-md-10">
+<div class="row">
+ <div class="col-md-12">
<div class="panel panel-default">
<ul class="list-group">
{{#if model.logs}}
{{#each model.logs as |log|}}
- <li class=list-group-item>
- {{#link-to 'yarn-tools.yarn-rm-log' (query-params filename=log.logfileName)}}
- {{log.logfileName}}
+ <li class="list-group-item">
+ {{#link-to 'yarn-tools.yarn-rm-log' (query-params filename=log.logFileUrl)}}
+ {{log.logFileName}}
{{/link-to}}
</li>
{{/each}}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org