Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js (revision 9cd211ac86bb1124bdee572fddb6f86655b19b73)
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js (date 1565256829000)
@@ -263,5 +263,12 @@
isLogAggregationNotSucceeded: Ember.computed("model.app", function() {
const logAggregationStatus = this.get("model.app.logAggregationStatus");
return logAggregationStatus !== "SUCCEEDED";
- })
+ }),
+
+ isTimelineUnHealthy: function() {
+ if (this.model && this.model.timelineHealth) {
+ return this.model.timelineHealth.get('isTimelineUnHealthy');
+ }
+ return true;
+ }.property('model.timelineHealth')
});
Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js (revision 9cd211ac86bb1124bdee572fddb6f86655b19b73)
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js (date 1565256771000)
@@ -31,7 +31,10 @@
attempts: this.fetchAttemptListFromRMorATS(app_id, this.store).catch(function() {
return [];
}),
- app: this.fetchAppInfoFromRMorATS(app_id, this.store)
+ app: this.fetchAppInfoFromRMorATS(app_id, this.store),
+ timelineHealth: this.store.queryRecord('timeline-health', {}).catch(function() {
+ return null;
+ })
});
},
Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs (revision 9cd211ac86bb1124bdee572fddb6f86655b19b73)
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs (date 1565263780000)
@@ -32,43 +32,52 @@
{{/if}}
- {{#if attemptList}}
-