[airavata] branch develop updated: Add metascheduler

[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 d6171ec2f8 Add metascheduler
     new d86792a883 Merge pull request #396 from isururanawaka/metaschedular
d6171ec2f8 is described below

commit d6171ec2f827c2eeba45448988113ca938f49ea1
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Thu Mar 9 10:53:06 2023 -0500

    Add metascheduler
---
 .../engine/cr/selection/MultipleComputeResourcePolicy.java     | 10 +---------
 .../registry/api/service/handler/RegistryServerHandler.java    |  4 +++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
 
b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
index 449613a68f..559930b3e2 100644
--- 
a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
+++ 
b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
@@ -23,7 +23,7 @@ import java.util.Random;
  * This class implements selecting one compute resource out of enabled 
multiple compute resource polices.
  * //TODO: implemented for load testing, for proper usecases airavata should 
enable multiple compute resources in Experiment creation
  */
-public class MultipleComputeResourcePolicy extends 
DefaultComputeResourceSelectionPolicy {
+public class MultipleComputeResourcePolicy extends 
ComputeResourceSelectionPolicyImpl  {
 
     private static final Logger LOGGER = 
LoggerFactory.getLogger(MultipleComputeResourcePolicy.class);
 
@@ -32,12 +32,6 @@ public class MultipleComputeResourcePolicy extends 
DefaultComputeResourceSelecti
         RegistryService.Client registryClient = 
super.registryClientPool.getResource();
         try {
 
-            Optional<ComputationalResourceSchedulingModel> 
optionalComputationalResourceSchedulingModel =
-                    super.selectComputeResource(processId);
-
-            if (optionalComputationalResourceSchedulingModel.isPresent()) {
-                return optionalComputationalResourceSchedulingModel;
-            } else {
                 ProcessModel processModel = 
registryClient.getProcess(processId);
 
 
@@ -93,8 +87,6 @@ public class MultipleComputeResourcePolicy extends 
DefaultComputeResourceSelecti
 //                    }
 //                    count++;
 //                }
-            }
-
         } catch (Exception exception) {
             LOGGER.error(" Exception occurred while scheduling Process with Id 
{}", processId, exception);
             this.registryClientPool.returnBrokenResource(registryClient);
diff --git 
a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
 
b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
index ac673a7956..8dadd0d831 100644
--- 
a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
+++ 
b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
@@ -4859,7 +4859,9 @@ public class RegistryServerHandler implements 
RegistryService.Iface {
             if (optionalQueueStatusModel.isPresent()) {
                 return optionalQueueStatusModel.get();
             } else {
-                throw new RegistryServiceException("Cannot find queue status 
with hostName" + hostName + " queueName" + queueName);
+                QueueStatusModel queueStatusModel = new QueueStatusModel();
+                queueStatusModel.setQueueUp(false);
+                return  queueStatusModel;
             }
         } catch (RegistryException e) {
             logger.error("Error while storing queue status models....", e);