Better cluster status logging

Author: bbimber

cluster/src/org/labkey/cluster/ClusterController.java

@@ -222,7 +222,9 @@ public boolean handlePost(JobIdsForm form, BindException errors) throws Exceptio
                 try
                 {
                     PipelineJob job = PipelineJob.readFromFile(json);
-                    job.setStatus(job.getActiveTaskStatus());
+
+                    _log.info("Submitting job: " + job.getJobGUID() + ": " + job.getActiveTaskStatus());
+                    PipelineService.get().setPipelineJobStatus(job, job.getActiveTaskStatus());
                 }
                 catch (PipelineJobException | IOException e)
                 {

cluster/src/org/labkey/cluster/pipeline/AbstractClusterExecutionEngine.java

@@ -561,8 +561,13 @@ else if (pj.getErrors() > 0)
                             pj.getLogger().warn("marking job as complete, even though JSON indicates task has errors.  this might indicate the job aborted improperly?");
                         }
                     }
+                    else if (pj.getActiveTaskStatus() == PipelineJob.TaskStatus.complete)
+                    {
+                        pj.getLogger().warn("Pipeline job marked complete, but the cluster status is error");
+
+                    }
 
-                    pj.getLogger().debug("setting active task status for job: " + j.getClusterId() + " to: " + taskStatus.name() + ". status was: " + pj.getActiveTaskStatus() + " (PipelineJob) /" + sf.getStatus() + " (StatusFile) / activeTaskId (job): " + (pj.getActiveTaskId() != null ? pj.getActiveTaskId().toString() : "no active task") + ", hostname: " + sf.getActiveHostName() + ", rowid: " + j.getRowId());
+                    pj.getLogger().debug("setting active task status for job: " + j.getClusterId() + " to: " + taskStatus.name() + ". status was: " + pj.getActiveTaskStatus() + " (JSON) /" + sf.getStatus() + " (StatusFile) / " + status + " (Cluster), activeTaskId: " + (pj.getActiveTaskId() != null ? pj.getActiveTaskId().toString() : "no active task") + ", hostname: " + sf.getActiveHostName() + ", rowid: " + j.getRowId());
                     try
                     {
                         //NOTE: PipelineService.setPipelineJobStatus() is needed to requeue a job upon completion, but in all other cases go through JMS