[airavata] branch staging updated: Improving status monitor logic

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/staging by this push:
     new ceeff05  Improving status monitor logic
ceeff05 is described below

commit ceeff058e84a768c6eebb0bf7459d6d757036adf
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Mon Apr 15 16:17:33 2019 -0400

    Improving status monitor logic
---
 .../main/java/org/apache/airavata/tools/load/StatusMonitor.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/load-client/src/main/java/org/apache/airavata/tools/load/StatusMonitor.java b/tools/load-client/src/main/java/org/apache/airavata/tools/load/StatusMonitor.java
index 5b57c51..8d90434 100644
--- a/tools/load-client/src/main/java/org/apache/airavata/tools/load/StatusMonitor.java
+++ b/tools/load-client/src/main/java/org/apache/airavata/tools/load/StatusMonitor.java
@@ -8,9 +8,9 @@ import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.security.AuthzToken;
 import org.apache.airavata.model.status.ExperimentState;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.model.status.JobStatus;
 import org.apache.thrift.TException;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -76,6 +76,7 @@ public class StatusMonitor {
         long totalExperiments = 0;
 
         System.out.println("EXP ID,CREATE_TIME,LAUNCHED_TIME,EXECUTING_TIME,JOB_SUBMIT_TIME");
+        List<String> lines = new ArrayList<>();
         for (String experiment : experiments) {
             try {
 
@@ -102,16 +103,20 @@ public class StatusMonitor {
                 //long expCompletedTime = experimentModelMap.get(experiment)
                 //        .getExperimentStatus().stream().filter(es -> es.getState() == ExperimentState.COMPLETED).findFirst()
                 //        .get().getTimeOfStateChange();
-                System.out.println(experiment + "," + expCreatedTime + "," + expLaunchedTime + "," + expExecutedTime + ","
+                lines.add(experiment + "," + expCreatedTime + "," + expLaunchedTime + "," + expExecutedTime + ","
                         + jobSubmittedTime);
                 totalTime += jobSubmittedTime - expExecutedTime;
                 totalExperiments ++;
             } catch (Exception e) {
                 System.out.println("Error parsing " + experiment + ". Err "+ e.getMessage());
+                e.printStackTrace();
             }
         }
         long monitoringStopTime = System.currentTimeMillis();
 
+        for (String line: lines) {
+            System.out.println(line);
+        }
         System.out.println("All jobs completed");
         System.out.println("Average time " + (totalTime *1.0/totalExperiments)/1000 + " s");
         System.out.println("Time for monitoring " + (monitoringStopTime - monitoringStartTime)/1000 + "s");