airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dimuthu...@apache.org
Subject [airavata] branch staging updated: Loading task retry count from the registry
Date Thu, 24 Jan 2019 02:11:43 GMT
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 358d242  Loading task retry count from the registry
358d242 is described below

commit 358d2426e7e87906f53d6cfa7f38583959e89521
Author: Dimuthu Wannipurage <dimuthu.upeksha2@gmail.com>
AuthorDate: Wed Jan 23 21:11:35 2019 -0500

    Loading task retry count from the registry
---
 .../org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java    | 1 +
 .../org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
index 68e667c..d8bba53 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
@@ -237,6 +237,7 @@ public class PostWorkflowManager extends WorkflowManager {
                     airavataTask.setExperimentId(experimentModel.getExperimentId());
                     airavataTask.setProcessId(processModel.getProcessId());
                     airavataTask.setTaskId(taskModel.getTaskId());
+                    airavataTask.setRetryCount(taskModel.getMaxRetry());
                     if (allTasks.size() > 0) {
                         allTasks.get(allTasks.size() - 1).setNextTask(new OutPort(airavataTask.getTaskId(),
airavataTask));
                     }
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
index ab5c038..3bac00b 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
@@ -106,7 +106,6 @@ public class PreWorkflowManager extends WorkflowManager {
                     airavataTask = new EnvSetupTask();
                 } else if (taskModel.getTaskType() == TaskTypes.JOB_SUBMISSION) {
                     airavataTask = new DefaultJobSubmissionTask();
-                    airavataTask.setRetryCount(1);
                     jobSubmissionFound = true;
                 } else if (taskModel.getTaskType() == TaskTypes.DATA_STAGING) {
                     if (!jobSubmissionFound) {
@@ -119,6 +118,7 @@ public class PreWorkflowManager extends WorkflowManager {
                     airavataTask.setExperimentId(experimentModel.getExperimentId());
                     airavataTask.setProcessId(processModel.getProcessId());
                     airavataTask.setTaskId(taskModel.getTaskId());
+                    airavataTask.setRetryCount(taskModel.getMaxRetry());
                     if (allTasks.size() > 0) {
                         allTasks.get(allTasks.size() -1).setNextTask(new OutPort(airavataTask.getTaskId(),
airavataTask));
                     }


Mime
View raw message