This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new d71b97fee2 change process model inputs
new 0bb6ad8e05 Merge pull request #400 from isururanawaka/metaschedular
d71b97fee2 is described below
commit d71b97fee2b04c6529fd353c6a959274a37f4650
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Fri Mar 10 09:07:09 2023 -0500
change process model inputs
---
.../process/scheduling/api/ProcessSchedulerImpl.java | 11 +++++++++++
.../engine/rescheduler/ExponentialBackOffReScheduler.java | 12 ++++++++++++
2 files changed, 23 insertions(+)
diff --git
a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
index 4cd5bc7dfa..689c12bc0f 100644
---
a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
+++
b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
@@ -69,6 +69,17 @@ public class ProcessSchedulerImpl implements
ProcessScheduler {
}
});
+ List<InputDataObjectType>
processInputDataObjectTypeList = processModel.getProcessInputs();
+ processInputDataObjectTypeList.forEach(obj->{
+ if (obj.getName().equals("Wall_Time")){
+
obj.setValue("-walltime="+resourceSchedulingModel.getWallTimeLimit());
+ }
+ if (obj.getName().equals("Parallel_Group_Count")){
+
obj.setValue("-mgroupcount="+resourceSchedulingModel.getMGroupCount());
+ }
+ });
+
+
processModel.setProcessInputs(processInputDataObjectTypeList);
experiment.setExperimentInputs(inputDataObjectTypeList);
processModel.setProcessResourceSchedule(resourceSchedulingModel);
processModel.setComputeResourceId(resourceSchedulingModel.getResourceHostId());
diff --git
a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
index 01fe73e35d..4df1c56c9a 100644
---
a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
+++
b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
@@ -132,6 +132,18 @@ public class ExponentialBackOffReScheduler implements
ReScheduler {
}
});
+ List<InputDataObjectType> processInputDataObjectTypeList =
processModel.getProcessInputs();
+ processInputDataObjectTypeList.forEach(obj->{
+ if (obj.getName().equals("Wall_Time")){
+
obj.setValue("-walltime="+resourceSchedulingModel.getWallTimeLimit());
+ }
+ if (obj.getName().equals("Parallel_Group_Count")){
+
obj.setValue("-mgroupcount="+resourceSchedulingModel.getMGroupCount());
+ }
+ });
+
+ processModel.setProcessInputs(processInputDataObjectTypeList);
+
experimentModel.setExperimentInputs(inputDataObjectTypeList);
processModel.setProcessResourceSchedule(resourceSchedulingModel);
processModel.setComputeResourceId(resourceSchedulingModel.getResourceHostId());