Merge pull request #109 from icgc-argo/RC/2.4.0

Rc/2.4.0
icgc-argo · Dec 8, 2020 · 06de1f3 · 06de1f3
2 parents f4ea3bf + 2f3c6a1
commit 06de1f3
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 21 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,6 +1,6 @@
-def dockerHubRepo = "icgcargo/workflow-relay"
+def dockerHub = "ghcr.io/icgc-argo/workflow-relay"
 def gitHubRepo = "icgc-argo/workflow-relay"
-def chartVersion = "0.3.0"
+def chartVersion = "0.4.0"
 def commit = "UNKNOWN"
 def version = "UNKNOWN"
 
@@ -69,15 +69,15 @@ spec:
                     }
                     steps {
                         container('docker') {
-                            withCredentials([usernamePassword(credentialsId:'argoDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-                                sh 'docker login -u $USERNAME -p $PASSWORD'
+                            withCredentials([usernamePassword(credentialsId:'argoContainers', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+                                sh 'docker login ghcr.io -u $USERNAME -p $PASSWORD'
                             }
 
                             // DNS error if --network is default
-                            sh "docker build --network=host . -t ${dockerHubRepo}:edge -t ${dockerHubRepo}:${version}-${commit}"
+                            sh "docker build --network=host . -t ${dockerHub}:edge -t ${dockerHub}:${version}-${commit}"
 
-                            sh "docker push ${dockerHubRepo}:${version}-${commit}"
-                            sh "docker push ${dockerHubRepo}:edge"
+                            sh "docker push ${dockerHub}:${version}-${commit}"
+                            sh "docker push ${dockerHub}:edge"
                         }
                     }
                 }
@@ -122,15 +122,15 @@ spec:
                               sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${gitHubRepo} --tags"
                             }
 
-                            withCredentials([usernamePassword(credentialsId:'argoDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-                                sh 'docker login -u $USERNAME -p $PASSWORD'
+                            withCredentials([usernamePassword(credentialsId:'argoContainers', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+                                sh 'docker login ghcr.io -u $USERNAME -p $PASSWORD'
                             }
 
                             // DNS error if --network is default
-                            sh "docker build --network=host . -t ${dockerHubRepo}:latest -t ${dockerHubRepo}:${version}"
+                            sh "docker build --network=host . -t ${dockerHub}:latest -t ${dockerHub}:${version}"
 
-                            sh "docker push ${dockerHubRepo}:${version}"
-                            sh "docker push ${dockerHubRepo}:latest"
+                            sh "docker push ${dockerHub}:${version}"
+                            sh "docker push ${dockerHub}:latest"
                         }
                     }
                 }

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>org.icgc_argo</groupId>
     <artifactId>workflow-relay</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
     <name>workflow-relay</name>
     <description>Demo project for Spring Boot</description>
 
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/org/icgc_argo/workflow/relay/model/index/WorkflowState.java b/src/main/java/org/icgc_argo/workflow/relay/model/index/WorkflowState.java
@@ -31,7 +31,9 @@ public enum WorkflowState {
 
   EXECUTOR_ERROR("EXECUTOR_ERROR"),
 
-  FAILED("FAILED");
+  FAILED("FAILED"),
+
+  ERROR("ERROR");
 
   @NonNull private final String value;
 

diff --git a/src/main/java/org/icgc_argo/workflow/relay/service/IndexService.java b/src/main/java/org/icgc_argo/workflow/relay/service/IndexService.java
@@ -112,12 +112,13 @@ public void indexTask(JsonNode event) {
     request.version(doc.getState().ordinal());
     try {
       val indexResponse = esClient.index(request, RequestOptions.DEFAULT);
-      log.trace(indexResponse.toString());
+      log.debug(indexResponse.toString());
     } catch (ElasticsearchStatusException e) {
-      log.trace(
-          "Out of order, already have newer version for task {} in run {}",
+      log.error(
+          "Out of order, already have newer version for task {} in run {}, exception: {}",
           doc.getTaskId(),
-          doc.getRunId());
+          doc.getRunId(),
+          e.getLocalizedMessage());
     }
   }
 
@@ -164,9 +165,12 @@ private void indexWorkflowDocIfNewVersion(WorkflowDocument doc) {
     request.version(doc.getState().ordinal());
     try {
       val indexResponse = esClient.index(request, RequestOptions.DEFAULT);
-      log.trace(indexResponse.toString());
+      log.debug(indexResponse.toString());
     } catch (ElasticsearchStatusException e) {
-      log.trace("Out of order, already have newer version for run {}", doc.getRunId());
+      log.error(
+          "Out of order, already have newer version for run {}, exception: {}",
+          doc.getRunId(),
+          e.getLocalizedMessage());
     }
   }
 }
diff --git a/src/main/java/org/icgc_argo/workflow/relay/service/SplitterService.java b/src/main/java/org/icgc_argo/workflow/relay/service/SplitterService.java
@@ -32,6 +32,7 @@
 import org.springframework.stereotype.Service;
 
 import static java.lang.String.format;
+import static org.icgc_argo.workflow.relay.model.index.WorkflowState.ERROR;
 import static org.icgc_argo.workflow.relay.model.index.WorkflowState.FAILED;
 
 @Profile("splitter")
@@ -102,6 +103,12 @@ public void split(JsonNode event) {
               // workflow topic key == nextflow runName (our wes id ... e.g. wes-1234567890abcdefg)
               .setHeader(KafkaHeaders.MESSAGE_KEY, runName.getBytes())
               .build());
+    } else if (event.has("event") && event.path("event").asText().equals(ERROR.toString())) {
+      // Error logs already handled above so we can ignore these raw error messages as they have
+      // almost no context past just letting you know that an error has occurred, which we can infer
+      // by looking at the detailed log
+      log.debug(
+          "Received raw error event, no handler specified at this time: {}", event.toString());
     } else {
       log.error("Unhandled event: {}", event.toString());
       throw new RuntimeException("Cannot handle event, please see DLQ for event information");