Explorar o código

HUE-873 [jb] Direct access to task logs

Priority: if not failed tasks, pick latest a map or reduce tasks
So Oozie launcher task will be showed first.
Remove HttpRedirect
Romain Rigaux %!s(int64=13) %!d(string=hai) anos
pai
achega
daea7e2eaa
Modificáronse 1 ficheiros con 2 adicións e 3 borrados
  1. 2 3
      apps/jobbrowser/src/jobbrowser/views.py

+ 2 - 3
apps/jobbrowser/src/jobbrowser/views.py

@@ -40,7 +40,6 @@ from jobbrowser import conf
 from jobbrowser.models import Job, JobLinkage, TaskList, Tracker, Cluster
 
 from django.utils.translation import ugettext as _
-from django.shortcuts import redirect
 
 ##################################
 ## View end-points
@@ -174,7 +173,7 @@ def job_single_logs(request, jobid):
   if failed_tasks:
     task = failed_tasks[0]
   else:
-    recent_tasks = job.filter_tasks(task_states=('running', 'succeeded',))
+    recent_tasks = job.filter_tasks(task_states=('running', 'succeeded',), task_types=('map', 'reduce',))
     recent_tasks.sort(cmp_exec_time, reverse=True)
     if recent_tasks:
       task = recent_tasks[0]
@@ -182,7 +181,7 @@ def job_single_logs(request, jobid):
   if task is None:
     raise PopupException(_("No tasks found for job %(id)s") % dict(id=jobid))
 
-  return redirect('single_task_attempt_logs', jobid=jobid, taskid= task.taskId, attemptid= task.taskAttemptIds[-1])
+  return single_task_attempt_logs(request, **{'jobid': jobid, 'taskid': task.taskId, 'attemptid': task.taskAttemptIds[-1]})
 
 @check_job_permission
 def tasks(request, jobid):