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 bd92967870 remove experiment update in processScheduler
new 25a5da1ab2 Merge pull request #403 from isururanawaka/metaschedular
bd92967870 is described below
commit bd929678704f973ee4ad8ad4ce0ffb8d1841f3ea
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Fri Mar 10 10:39:53 2023 -0500
remove experiment update in processScheduler
---
.../scheduling/api/ProcessSchedulerImpl.java | 26 +++++++++---------
.../rescheduler/ExponentialBackOffReScheduler.java | 32 +++++++++++-----------
2 files changed, 29 insertions(+), 29 deletions(-)
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 f53ebbb5df..fd81a19060 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
@@ -59,17 +59,17 @@ public class ProcessSchedulerImpl implements
ProcessScheduler {
if (computationalResourceSchedulingModel.isPresent()) {
ComputationalResourceSchedulingModel
resourceSchedulingModel = computationalResourceSchedulingModel.get();
- List<InputDataObjectType> inputDataObjectTypeList =
experiment.getExperimentInputs();
- inputDataObjectTypeList.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());
- }
- });
-
-
experiment.setExperimentInputs(inputDataObjectTypeList);
+// List<InputDataObjectType> inputDataObjectTypeList =
experiment.getExperimentInputs();
+// inputDataObjectTypeList.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());
+// }
+// });
+
+//
experiment.setExperimentInputs(inputDataObjectTypeList);
List<InputDataObjectType>
processInputDataObjectTypeList = processModel.getProcessInputs();
processInputDataObjectTypeList.forEach(obj->{
@@ -95,8 +95,8 @@ public class ProcessSchedulerImpl implements ProcessScheduler
{
}
}
}
- experiment.setProcesses(processModels);
- registryClient.updateExperiment(experimentId,experiment);
+// experiment.setProcesses(processModels);
+// registryClient.updateExperiment(experimentId,experiment);
return allProcessesScheduled;
} catch (Exception exception) {
LOGGER.error(" Exception occurred while scheduling experiment with
Id {}", experimentId, exception);
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 af54da0a52..1bd8c88852 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
@@ -122,15 +122,15 @@ public class ExponentialBackOffReScheduler implements
ReScheduler {
if (computationalResourceSchedulingModel.isPresent()) {
ComputationalResourceSchedulingModel resourceSchedulingModel =
computationalResourceSchedulingModel.get();
- List<InputDataObjectType> inputDataObjectTypeList =
experimentModel.getExperimentInputs();
- inputDataObjectTypeList.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());
- }
- });
+// List<InputDataObjectType> inputDataObjectTypeList =
experimentModel.getExperimentInputs();
+// inputDataObjectTypeList.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());
+// }
+// });
List<InputDataObjectType> processInputDataObjectTypeList =
processModel.getProcessInputs();
processInputDataObjectTypeList.forEach(obj->{
@@ -143,17 +143,17 @@ public class ExponentialBackOffReScheduler implements
ReScheduler {
});
processModel.setProcessInputs(processInputDataObjectTypeList);
- experimentModel.setExperimentInputs(inputDataObjectTypeList);
- experimentModel.getProcesses().forEach(pr->{
- if (pr.getProcessId().equals(processModel.getProcessId())){
- pr.setProcessInputs(processModel.getProcessInputs());
- }
- });
+// experimentModel.setExperimentInputs(inputDataObjectTypeList);
+// experimentModel.getProcesses().forEach(pr->{
+// if (pr.getProcessId().equals(processModel.getProcessId())){
+// pr.setProcessInputs(processModel.getProcessInputs());
+// }
+// });
processModel.setProcessResourceSchedule(resourceSchedulingModel);
processModel.setComputeResourceId(resourceSchedulingModel.getResourceHostId());
registryClient.updateProcess(processModel,
processModel.getProcessId());
- registryClient.updateExperiment(processModel.getExperimentId(),
experimentModel);
+// registryClient.updateExperiment(processModel.getExperimentId(),
experimentModel);
}
}
}
