You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2019/06/03 14:54:48 UTC
[airavata] branch master updated: Overriding forced run = true for
retry-able data movement tasks
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new c91e5dc Overriding forced run = true for retry-able data movement tasks
c91e5dc is described below
commit c91e5dc94b729cdef7ddb3329856bec87114fbc9
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Mon Jun 3 10:54:34 2019 -0400
Overriding forced run = true for retry-able data movement tasks
---
.../org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java | 3 ++-
.../org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
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 90a0862..112a26b 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
@@ -241,9 +241,11 @@ public class PostWorkflowManager extends WorkflowManager {
switch (subTaskModel.getType()) {
case OUPUT:
airavataTask = new OutputDataStagingTask();
+ airavataTask.setForceRunTask(true);
break;
case ARCHIVE_OUTPUT:
airavataTask = new ArchiveTask();
+ airavataTask.setForceRunTask(true);
break;
}
}
@@ -255,7 +257,6 @@ public class PostWorkflowManager extends WorkflowManager {
airavataTask.setProcessId(processModel.getProcessId());
airavataTask.setTaskId(taskModel.getTaskId());
airavataTask.setRetryCount(taskModel.getMaxRetry());
- airavataTask.setForceRunTask(forceRun);
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 9b716c1..4d140b6 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
@@ -105,12 +105,15 @@ public class PreWorkflowManager extends WorkflowManager {
AiravataTask airavataTask = null;
if (taskModel.getTaskType() == TaskTypes.ENV_SETUP) {
airavataTask = new EnvSetupTask();
+ airavataTask.setForceRunTask(true);
} else if (taskModel.getTaskType() == TaskTypes.JOB_SUBMISSION) {
airavataTask = new DefaultJobSubmissionTask();
+ airavataTask.setForceRunTask(forceRun);
jobSubmissionFound = true;
} else if (taskModel.getTaskType() == TaskTypes.DATA_STAGING) {
if (!jobSubmissionFound) {
airavataTask = new InputDataStagingTask();
+ airavataTask.setForceRunTask(true);
}
}
@@ -120,7 +123,6 @@ public class PreWorkflowManager extends WorkflowManager {
airavataTask.setProcessId(processModel.getProcessId());
airavataTask.setTaskId(taskModel.getTaskId());
airavataTask.setRetryCount(taskModel.getMaxRetry());
- airavataTask.setForceRunTask(forceRun);
if (allTasks.size() > 0) {
allTasks.get(allTasks.size() -1).setNextTask(new OutPort(airavataTask.getTaskId(), airavataTask));
}