[airavata] branch develop updated: change default policy class

[isjarana]

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 ab20a8ed83 change default policy class
     new 42fdcfc109 Merge pull request #395 from isururanawaka/metaschedular
ab20a8ed83 is described below

commit ab20a8ed8316e6a7c4804d57c4ff01e9256dbccd
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Thu Mar 9 09:22:45 2023 -0500

    change default policy class
---
 .../metascheduler/process/scheduling/api/ProcessSchedulerImpl.java      | 1 +
 .../src/main/java/org/apache/airavata/common/utils/ServerSettings.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 4ac44ed705..4cd5bc7dfa 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
@@ -46,6 +46,7 @@ public class ProcessSchedulerImpl implements ProcessScheduler 
{
             boolean allProcessesScheduled = true;
 
             String selectionPolicyClass = 
ServerSettings.getComputeResourceSelectionPolicyClass();
+
             ComputeResourceSelectionPolicy policy = 
(ComputeResourceSelectionPolicy) 
Class.forName(selectionPolicyClass).newInstance();
 
             for(ProcessModel processModel:processModels) {
diff --git 
a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
 
b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
index 2567a0e6f0..0221d17c93 100644
--- 
a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
+++ 
b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
@@ -513,7 +513,7 @@ public class ServerSettings extends ApplicationSettings {
 
     public static String getComputeResourceSelectionPolicyClass() throws 
ApplicationSettingsException {
         return getSetting(COMPUTE_RESOURCE_SELECTION_POLICY_CLASS,
-                
"org.apache.airavata.metascheduler.process.scheduling.cr.DefaultComputeResourceSelectionPolicy");
+                
"org.apache.airavata.metascheduler.process.scheduling.engine.cr.selection.MultipleComputeResourcePolicy");
     }
 
     public static String getReSchedulerPolicyClass() throws 
ApplicationSettingsException {