Show task throughput

Evolveum · Jul 16, 2019 · 9c61d6b · 9c61d6b
1 parent 6368c0b
commit 9c61d6b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/...a/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java b/...a/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java
@@ -339,27 +339,25 @@ public String getObject() {
         });
         add(currentObjectProcessedTime);
 
-        Label objectsTotal = new Label(ID_OBJECTS_TOTAL, new IModel<String>() {
-            @Override
-            public String getObject() {
-                TaskCurrentStateDto dto = getModelObject();
-                if (dto == null) {
-                    return null;
-                }
-                IterativeTaskInformationType info = dto.getIterativeTaskInformationType();
-                if (info == null) {
-                    return null;
-                }
-                int objectsTotal = info.getTotalSuccessCount() + info.getTotalFailureCount();
-                if (WALL_CLOCK_AVG_CATEGORIES.contains(dto.getTaskDto().getCategory())) {
-                    Long avg = getWallClockAverage(dto, objectsTotal);
-                    if (avg != null) {
-                        return getString("TaskStatePanel.message.objectsTotal",
-                                objectsTotal, avg);
-                    }
+        Label objectsTotal = new Label(ID_OBJECTS_TOTAL, (IModel<String>) () -> {
+            TaskCurrentStateDto dto = getModelObject();
+            if (dto == null) {
+                return null;
+            }
+            IterativeTaskInformationType info = dto.getIterativeTaskInformationType();
+            if (info == null) {
+                return null;
+            }
+            int objectsTotal1 = info.getTotalSuccessCount() + info.getTotalFailureCount();
+            if (WALL_CLOCK_AVG_CATEGORIES.contains(dto.getTaskDto().getCategory())) {
+                Long avg = getWallClockAverage(dto, objectsTotal1);
+                if (avg != null) {
+                    long throughput = avg != 0 ? 60000 / avg : 0;       // TODO what if avg == 0?
+                    return getString("TaskStatePanel.message.objectsTotal",
+                            objectsTotal1, avg, throughput);
                 }
-                return String.valueOf(objectsTotal);
             }
+            return String.valueOf(objectsTotal1);
         });
         add(objectsTotal);
     }

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3305,7 +3305,7 @@ TaskStatePanel.message.lastObjectProcessed={0}
 TaskStatePanel.message.node= - at node {0}
 TaskStatePanel.message.objectsProcessed={0}
 TaskStatePanel.message.objectsProcessedTime=(average time {1} ms, total processing time {0} seconds)
-TaskStatePanel.message.objectsTotal={0} (wall clock average: {1} ms)
+TaskStatePanel.message.objectsTotal={0} (wall clock average: {1} ms, throughput: {2} per minute)
 TaskStatePanel.message.timeInfoWithAgo={0} ({1} ago)
 TaskStatePanel.message.timeInfoWithDuration={0} (in {1} ms)
 TaskStatePanel.message.timeInfoWithDurationAndAgo={0} ({1} ago - in {2} ms)

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3294,7 +3294,7 @@ TaskStatePanel.message.lastObjectProcessed={0}
 TaskStatePanel.message.node= - at node {0}
 TaskStatePanel.message.objectsProcessed={0}
 TaskStatePanel.message.objectsProcessedTime=(average time {1} ms, total processing time {0} seconds)
-TaskStatePanel.message.objectsTotal={0} (wall clock average: {1} ms)
+TaskStatePanel.message.objectsTotal={0} (wall clock average: {1} ms, throughput: {2} per minute)
 TaskStatePanel.message.timeInfoWithAgo={0} ({1} ago)
 TaskStatePanel.message.timeInfoWithDuration={0} (in {1} ms)
 TaskStatePanel.message.timeInfoWithDurationAndAgo={0} ({1} ago - in {2} ms)