From e69db45e500f83a166e35a3fcc29a8029ecb3c5c Mon Sep 17 00:00:00 2001
From: Sunil G <sunilg@apache.org>
Date: Sat, 10 Aug 2019 21:10:22 +0530
Subject: [PATCH] Revert "YARN-9729. [UI2] Fix error message for logs without
 ATSv2. Contributed by Zoltan Siegl."

This reverts commit 50cec5a704d11ffc5e0333d22dbea7cf6837c2fc.
---
 .../webapp/app/controllers/yarn-app/logs.js   |  9 +--
 .../main/webapp/app/routes/yarn-app/logs.js   |  5 +-
 .../webapp/app/templates/yarn-app/logs.hbs    | 73 ++++++++-----------
 3 files changed, 34 insertions(+), 53 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
index d7eac3ffd5b..e1a8ec8dc27 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
@@ -263,12 +263,5 @@ 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')
+  })
 });
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 9719f804f04..b73bc80f175 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
@@ -31,10 +31,7 @@ export default AbstractRoute.extend(AppAttemptMixin, {
       attempts: this.fetchAttemptListFromRMorATS(app_id, this.store).catch(function() {
         return [];
       }),
-      app: this.fetchAppInfoFromRMorATS(app_id, this.store),
-      timelineHealth: this.store.queryRecord('timeline-health', {}).catch(function() {
-        return null;
-      })
+      app: this.fetchAppInfoFromRMorATS(app_id, this.store)
     });
   },
 
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 72147b9af9c..10fd73ec940 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
@@ -32,52 +32,43 @@
             <img src="assets/images/spinner.gif" alt="Loading...">
           </div>
         {{/if}}
-        {{#if isTimelineUnHealthy}}
-            <div class="row panel-heading">
-                <div class="col-md-2"></div>
-                <div class="col-md-8 alert alert-warning glyphicon glyphicon-warning-sign text-center">
-                    <span>Logs are unavailable because Application Timeline Service seems unhealthy.</span>
-                </div>
+        {{#if attemptList}}
+          <div class="row">
+            <div class="col-md-6">
+              <label>Choose attempt to fetch containers</label>
+              <div>
+                <select class="js-fetch-attempt-containers" onchange={{action "showContainersForAttemptId" value="target.value"}} style="max-width:350px;">
+                  <option value="" selected={{eq selectedAttemptId ''}}>None</option>
+                  {{#each attemptList as |attempt|}}
+                    <option value="{{attempt.id}}" selected={{eq selectedAttemptId attempt.id}}>{{attempt.id}}</option>
+                  {{/each}}
+                </select>
+              </div>
             </div>
-        {{else}}
-            {{#if attemptList}}
-                <div class="row">
-                    <div class="col-md-6">
-                        <label>Choose attempt to fetch containers</label>
-                        <div>
-                            <select class="js-fetch-attempt-containers" onchange={{action "showContainersForAttemptId" value="target.value"}} style="max-width:350px;">
-                                <option value="" selected={{eq selectedAttemptId ''}}>None</option>
-                                {{#each attemptList as |attempt|}}
-                                    <option value="{{attempt.id}}" selected={{eq selectedAttemptId attempt.id}}>{{attempt.id}}</option>
-                                {{/each}}
-                            </select>
-                        </div>
-                    </div>
-                    {{#if attemptContainerList}}
-                        <div class="col-md-6">
-                            <label>Choose container to fetch logs</label>
-                            <div>
-                                <select class="js-fetch-logs-containers" onchange={{action "showLogFilesForContainerId" value="target.value"}} style="max-width:350px">
-                                    <option value="" selected={{eq selectedContainerId ''}}>None</option>
-                                    {{#each attemptContainerList as |container|}}
-                                        <option value="{{container.id}}" selected={{eq selectedContainerId container.id}}>{{container.id}}</option>
-                                    {{/each}}
-                                </select>
-                            </div>
-                        </div>
-                    {{else}}
-                        {{#if (and selectedAttemptId (not _isLoadingTopPanel))}}
-                            <div class="col-md-4">
-                                <h4 class="text-center" style="margin-top:25px;">No container data available!</h4>
-                            </div>
-                        {{/if}}
-                    {{/if}}
+            {{#if attemptContainerList}}
+              <div class="col-md-6">
+                <label>Choose container to fetch logs</label>
+                <div>
+                  <select class="js-fetch-logs-containers" onchange={{action "showLogFilesForContainerId" value="target.value"}} style="max-width:350px">
+                    <option value="" selected={{eq selectedContainerId ''}}>None</option>
+                    {{#each attemptContainerList as |container|}}
+                      <option value="{{container.id}}" selected={{eq selectedContainerId container.id}}>{{container.id}}</option>
+                    {{/each}}
+                  </select>
                 </div>
+              </div>
             {{else}}
-                <div class="col-md-12">
-                    <h4 class="text-center">No data available!</h4>
+              {{#if (and selectedAttemptId (not _isLoadingTopPanel))}}
+                <div class="col-md-4">
+                  <h4 class="text-center" style="margin-top:25px;">No container data available!</h4>
                 </div>
+              {{/if}}
             {{/if}}
+          </div>
+        {{else}}
+          <div class="col-md-12">
+            <h4 class="text-center">No data available!</h4>
+          </div>
         {{/if}}
       </div>
     </div>