JAL-3878 Fix workers done condition to account for broken jobs.

diff --git a/src/jalview/ws2/WebServiceExecutor.java b/src/jalview/ws2/WebServiceExecutor.java
index 4b41464..86016d2 100644 (file)
--- a/src/jalview/ws2/WebServiceExecutor.java
+++ b/src/jalview/ws2/WebServiceExecutor.java
@@ -35,9 +35,10 @@ public class WebServiceExecutor
 
   private void pollJobs(WebServiceWorkerI worker)
   {
+    boolean done;
     try
     {
-      worker.pollJobs();
+      done = worker.pollJobs();
     } catch (Exception e)
     {
       Cache.log.error("Failed to poll web service jobs.", e);
@@ -48,7 +49,7 @@ public class WebServiceExecutor
       wsThreadSupport.pollFailed(worker, e);
       return;
     }
-    if (!worker.isDone())
+    if (!done)
     {
       executor.schedule(() -> pollJobs(worker), 1, TimeUnit.SECONDS);
     }

diff --git a/src/jalview/ws2/WebServiceWorkerI.java b/src/jalview/ws2/WebServiceWorkerI.java
index be719c1..f1864fc 100644 (file)
--- a/src/jalview/ws2/WebServiceWorkerI.java
+++ b/src/jalview/ws2/WebServiceWorkerI.java
@@ -25,7 +25,7 @@ public interface WebServiceWorkerI
       return false;
     for (WSJob job : getJobs())
     {
-      if (!job.getStatus().isDone())
+      if (!job.getStatus().isDone() && !job.getStatus().isFailed())
         return false;
     }
     return true;

diff --git a/src/jalview/ws2/operations/AlignmentOperation.java b/src/jalview/ws2/operations/AlignmentOperation.java
index f72978a..f836c91 100644 (file)
--- a/src/jalview/ws2/operations/AlignmentOperation.java
+++ b/src/jalview/ws2/operations/AlignmentOperation.java
@@ -366,6 +366,7 @@ public class AlignmentOperation implements Operation
     @Override
     public void startJobs() throws IOException
     {
+      Cache.log.info(format("Starting new %s job.", service.getName()));
       String outputHeader = String.format("%s of %s%nJob details%n",
               submitGaps ? "Re-alignment" : "Alignment", alnTitle);
       SequenceI[][] conmsa = msa.getVisibleContigs('-');
@@ -382,7 +383,7 @@ public class AlignmentOperation implements Operation
         WSJob job = new WSJob(service.getProviderName(), service.getName(),
                 service.getHostName());
         job.setJobNum(wsInfo.addJobPane());
-        if (conmsa.length > 0)
+        if (conmsa.length > 1)
         {
           wsInfo.setProgressName(String.format("region %d", i),
                   job.getJobNum());
@@ -448,7 +449,7 @@ public class AlignmentOperation implements Operation
       boolean done = true;
       for (WSJob job : getJobs())
       {
-        if (!job.getStatus().isDone())
+        if (!job.getStatus().isDone() && !job.getStatus().isFailed())
         {
           Cache.log.debug(format("Polling job %s.", job));
           try
@@ -479,7 +480,7 @@ public class AlignmentOperation implements Operation
           Cache.log.debug(
                   format("Job %s status is %s", job, job.getStatus()));
         }
-        done &= job.getStatus().isDone();
+        done &= job.getStatus().isDone() || job.getStatus().isFailed();
       }
       updateWSInfoGlobalStatus();
       return done;