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 su...@apache.org on 2018/02/06 10:02:20 UTC
hadoop git commit: YARN-7850. [UI2] Log Aggregation status to be displayed in Application Page. Contributed by Gergely Novák.
Repository: hadoop
Updated Branches:
refs/heads/trunk 87429affc -> 2c326088a
YARN-7850. [UI2] Log Aggregation status to be displayed in Application Page. Contributed by Gergely Novák.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2c326088
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2c326088
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2c326088
Branch: refs/heads/trunk
Commit: 2c326088ae3401453a56fa0f4edfd8df5ed4a924
Parents: 87429af
Author: Sunil G <su...@apache.org>
Authored: Tue Feb 6 15:32:09 2018 +0530
Committer: Sunil G <su...@apache.org>
Committed: Tue Feb 6 15:32:09 2018 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/models/yarn-app.js | 18 +++++++++++++++++-
.../src/main/webapp/app/routes/yarn-app/logs.js | 3 ++-
.../main/webapp/app/templates/yarn-app/logs.hbs | 4 ++++
3 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c326088/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
index 7e3050f..5d0f23b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
@@ -127,5 +127,21 @@ export default DS.Model.extend({
}
return "label label-" + style;
- }.property("finalStatus")
+ }.property("finalStatus"),
+
+ logAggregationStatusStyle: function() {
+ const logAggregationStatus = this.get("logAggregationStatus");
+ var style = "";
+ if (logAggregationStatus === "FAILED" ||
+ logAggregationStatus === "TIME_OUT") {
+ style = "danger";
+ } else if (logAggregationStatus === "RUNNING_WITH_FAILURE") {
+ style = "warning";
+ } else if (logAggregationStatus === "SUCCEEDED") {
+ style = "success";
+ } else {
+ style = "default";
+ }
+ return "label label-" + style;
+ }.property("logAggregationStatus")
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c326088/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
index 8837503..99e4cff 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
@@ -30,7 +30,8 @@ export default AbstractRoute.extend(AppAttemptMixin, {
serviceName: service,
attempts: this.fetchAttemptListFromRMorATS(app_id, this.store).catch(function() {
return [];
- })
+ }),
+ app: this.fetchAppInfoFromRMorATS(app_id, this.store)
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c326088/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs
index 53173b4..a190def 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs
@@ -23,6 +23,10 @@
Logs {{collapsible-panel targetId="logFilesCollapsablePanel"}}
</div>
<div class="panel-body" id="logFilesCollapsablePanel">
+ <label>Log aggregation status:</label>
+ <span class={{model.app.logAggregationStatusStyle}}>
+ {{model.app.logAggregationStatus}}
+ </span>
{{#if _isLoadingTopPanel}}
<div class="text-center" style="z-index: 100; position: absolute; left: 46%;">
<img src="assets/images/spinner.gif" alt="Loading...">
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org