浏览代码

HUE-1176 [jb] Add Proper logs and counter on the YARN task attempt page

Romain Rigaux 8 年之前
父节点
当前提交
924bde9

+ 5 - 22
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -588,28 +588,11 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
   <div class="tab-content">
     <div class="tab-pane active" id="job-mapreduce-task-attempt-page-logs">
-      <ul class="nav nav-tabs">
-        <li class="active"><a href="#job-mapreduce-task-attempt-page-logs-attempts" data-toggle="tab">${ _('Attempts') }</a></li>
-        <li><a href="#job-mapreduce-task-attempt-page-logs-container" data-toggle="tab">${ _('Container') }</a></li>
-      </ul>
-
-      <div class="tab-content">
-        <div class="tab-pane active" id="job-mapreduce-task-attempt-page-logs-attempts">
-          % for name in ['stdout', 'stderr', 'syslog']:
-            <a href="javascript:void(0)" data-bind="click: function() { fetchLogs('${ name }'); }, text: '${ name }'"></a>
-          % endfor
-          <br>
-          <pre data-bind="html: logs"></pre>
-        </div>
-
-        <div class="tab-pane" id="job-mapreduce-task-attempt-page-logs-container">
-          % for name in ['stdout', 'stderr', 'syslog']:
-            <a href="javascript:void(0)" data-bind="click: function() { fetchLogs('${ name }'); }, text: '${ name }'"></a>
-          % endfor
-          <br>
-          <pre data-bind="html: logs"></pre>
-        </div>
-      </div>
+      % for name in ['stdout', 'stderr', 'syslog']:
+        <a href="javascript:void(0)" data-bind="click: function() { fetchLogs('${ name }'); }, text: '${ name }'"></a>
+      % endfor
+      <br>
+      <pre data-bind="html: logs"></pre>
     </div>
 
     <div class="tab-pane" id="job-mapreduce-task-attempt-page-counters">

+ 1 - 1
apps/jobbrowser/src/jobbrowser/yarn_models.py

@@ -403,7 +403,7 @@ class Attempt:
   @property
   def counters(self):
     if not hasattr(self, '_counters'):
-      self._counters = self.task.job.api.task_attempt_counters(self.task.jobId, self.task.id, self.id)['jobCounters']
+      self._counters = self.task.job.api.task_attempt_counters(self.task.jobId, self.task.id, self.id)['jobTaskAttemptCounters']
     return self._counters
 
   def get_task_log(self, offset=0):