YARN-9729. [UI2] Fix error message for logs when ATSv2 is offline. Contributed by Zoltan Siegl.

(cherry picked from commit 1c5b28659f)
This commit is contained in:
Sunil G 2019-08-11 11:46:47 +05:30
parent a7bc09c596
commit 02b4635ff0
3 changed files with 54 additions and 35 deletions

View File

@ -263,5 +263,12 @@ export default Ember.Controller.extend({
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')
});

View File

@ -31,7 +31,10 @@ export default AbstractRoute.extend(AppAttemptMixin, {
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;
})
});
},

View File

@ -32,6 +32,14 @@
<img src="assets/images/spinner.gif" alt="Loading...">
</div>
{{/if}}
{{#if isTimelineUnHealthy}}
<div class="row">
<div class="col-md-8 col-md-offset-2 alert alert-warning text-center">
<span class="glyphicon glyphicon-warning-sign" style="padding-right: 10px"></span>
<span>Logs are unavailable because Application Timeline Service seems unhealthy.</span>
</div>
</div>
{{else}}
{{#if attemptList}}
<div class="row">
<div class="col-md-6">
@ -70,6 +78,7 @@
<h4 class="text-center">No data available!</h4>
</div>
{{/if}}
{{/if}}
</div>
</div>
</div>