Fix #1504, Fix long-run action state update issue

littlezhou · Dec 25, 2017 · 3d134fa · 3d134fa
1 parent bd0f994
commit 3d134fa
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/smart-engine/src/main/java/org/smartdata/server/engine/CmdletManager.java b/smart-engine/src/main/java/org/smartdata/server/engine/CmdletManager.java
@@ -818,9 +818,17 @@ public ActionGroup(List<ActionInfo> actions, long totalNumOfActions) {
 
   public ActionGroup listActions(long pageIndex, long numPerPage,
       List<String> orderBy, List<Boolean> isDesc) throws IOException, MetaStoreException {
+    List<ActionInfo> infos = metaStore.listPageAction((pageIndex - 1) * numPerPage,
+        numPerPage, orderBy, isDesc);
+    for (ActionInfo info : infos) {
+      ActionInfo memInfo = idToActions.get(info.getActionId());
+      if (memInfo != null) {
+        info.setCreateTime(memInfo.getCreateTime());
+        info.setProgress(memInfo.getProgress());
+      }
+    }
 
-    return new ActionGroup(metaStore.listPageAction((pageIndex - 1) * numPerPage,
-        numPerPage, orderBy, isDesc), metaStore.getCountOfAllAction());
+    return new ActionGroup(infos, metaStore.getCountOfAllAction());
   }
 
   public List<ActionInfo> getActions(long rid, int size) throws IOException {