import 15.2.0 Octopus source

[ceph.git] / ceph / src / pybind / mgr / dashboard / controllers / task.py

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/task.py b/ceph/src/pybind/mgr/dashboard/controllers/task.py
index 9380f07015ae74e315c4ac998a30a50c78c159fc..8ac97fdb8f1e746a1d5e301c30223c9fbf7553dc 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/task.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/task.py
@@ -3,12 +3,21 @@ from __future__ import absolute_import
 
 from . import ApiController, RESTController
 from ..tools import TaskManager
+from ..services import progress
 
 
 @ApiController('/task')
 class Task(RESTController):
     def list(self, name=None):
         executing_t, finished_t = TaskManager.list_serializable(name)
+
+        e, f = progress.get_progress_tasks()
+        executing_t.extend(e)
+        finished_t.extend(f)
+
+        executing_t.sort(key=lambda t: t['begin_time'], reverse=True)
+        finished_t.sort(key=lambda t: t['end_time'], reverse=True)
+
         return {
             'executing_tasks': executing_t,
             'finished_tasks': finished_t