From 5e147e14fefec371ec30f2a7af6f825d13358347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Thu, 8 Mar 2018 17:09:36 +0100
Subject: [PATCH] FIX: some finished tasks looks like failed
---
.../fiji/haas_spim_benchmark/core/BenchmarkJobManager.java | 7 +++----
.../cz/it4i/fiji/haas_spim_benchmark/core/Constants.java | 3 ++-
.../fiji/haas_spim_benchmark/core/JobStateComparator.java | 2 +-
.../haas_spim_benchmark/ui/BenchmarkSPIMController.java | 1 +
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java
index 43272985..1a90371e 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java
@@ -109,11 +109,10 @@ public class BenchmarkJobManager {
verifiedStateProcessed = true;
return CompletableFuture.supplyAsync(() -> {
try {
- verifiedState = Stream
- .concat(Arrays.asList(state).stream(), getTasks().stream()
+ verifiedState =
+ Stream.concat(Arrays.asList(state).stream(), getTasks().stream().filter(task->!task.getDescription().equals(Constants.DONE_TASK))
.flatMap(task -> task.getComputations().stream()).map(tc -> tc.getState()))
- .max(new JobStateComparator()).get();
-
+ .max(new JobStateComparator()).get();
if (verifiedState != JobState.Finished && verifiedState != JobState.Canceled) {
verifiedState = JobState.Failed;
}
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
index 0327e917..dd3ce050 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
@@ -38,7 +38,7 @@ public interface Constants {
put("define_output", "Define output");
put("hdf5_xml_output", "Define hdf5 output");
put("resave_hdf5_output", "Resave output to hdf5");
- put("done", "Done");
+ put(DONE_TASK, "Done");
}};
String STATISTICS_TASK_NAME = "Task name";
@@ -51,5 +51,6 @@ public interface Constants {
String STATISTICS_SUMMARY_FILENAME = "summary.csv";
String SUMMARY_FILE_HEADER = "Task;AvgMemoryUsage;AvgWallTime;MaxWallTime;TotalTime;JobCount";
+ String DONE_TASK = "done";
}
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/JobStateComparator.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/JobStateComparator.java
index 09a56886..6b312cb8 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/JobStateComparator.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/JobStateComparator.java
@@ -14,7 +14,7 @@ public class JobStateComparator implements Comparator<JobState>{
priorities.put(state, priorities.size());
}
- {
+ static {
Arrays.asList(JobState.Finished,JobState.Queued, JobState.Running, JobState.Canceled, JobState.Failed).forEach(state->add(state));
}
@Override
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
index bebabfe8..f37db8a9 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
@@ -41,6 +41,7 @@ import javafx.scene.control.TableView;
import javafx.scene.layout.BorderPane;
import net.imagej.updater.util.Progress;
+//TASK: fix Exception during context menu request on task with N/A state
public class BenchmarkSPIMController extends BorderPane implements CloseableControl, InitiableControl {
@FXML
--
GitLab