[airavata] branch develop updated: add queries

[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 ed25ea29cb add queries
     new 196d96d8f4 Merge pull request #351 from isururanawaka/metaschedular
ed25ea29cb is described below

commit ed25ea29cb93842e88a6db74f19bcbe1740f99e0
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Fri Dec 2 09:42:54 2022 -0500

    add queries
---
 .../cr/selection/DefaultComputeResourceSelectionPolicy.java       | 8 ++++++--
 .../org/apache/airavata/registry/core/utils/QueryConstants.java   | 5 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
 
b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
index 5d3fc46330..49b0717a15 100644
--- 
a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
+++ 
b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
@@ -25,7 +25,7 @@ public class DefaultComputeResourceSelectionPolicy extends 
ComputeResourceSelect
 
     @Override
     public Optional<ComputationalResourceSchedulingModel> 
selectComputeResource(String processId) {
-        final RegistryService.Client registryClient = 
this.registryClientPool.getResource();
+        RegistryService.Client registryClient = 
this.registryClientPool.getResource();
         try {
             ProcessModel processModel = registryClient.getProcess(processId);
 
@@ -54,8 +54,12 @@ public class DefaultComputeResourceSelectionPolicy extends 
ComputeResourceSelect
             }
         } catch (Exception exception) {
             LOGGER.error(" Exception occurred while scheduling Process with Id 
{}", processId, exception);
+            this.registryClientPool.returnBrokenResource(registryClient);
+            registryClient = null;
         } finally {
-            this.registryClientPool.returnResource(registryClient);
+            if(registryClient != null) {
+                this.registryClientPool.returnResource(registryClient);
+            }
         }
         return Optional.empty();
     }
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
index d791ca54b0..b38298e17e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
@@ -185,9 +185,8 @@ public interface QueryConstants {
     String FIND_ALL_PARSERS_FOR_GATEWAY_ID = "SELECT P FROM " + 
ParserEntity.class.getSimpleName() + " P " +
             "WHERE P.gatewayId = :" + DBConstants.Parser.GATEWAY_ID;
 
-    String FIND_QUEUE_STATUS = "SELECT Q FROM " + 
QueueStatusModel.class.getSimpleName() + " Q " +
-    " WHERE Q.createdTime=(SELECT  MAX(L.CREATED_TIME) L FROM" + 
QueueStatusModel.class.getSimpleName() + " L WHERE L.hostName LIKE :"
-            + DBConstants.QueueStatus.HOST_NAME + " AND L.queueName LIKE :" + 
DBConstants.QueueStatus.QUEUE_NAME +")";
+    String FIND_QUEUE_STATUS = "SELECT  L  FROM " + 
QueueStatusEntity.class.getSimpleName() + " L WHERE L.hostName LIKE :"
+            + DBConstants.QueueStatus.HOST_NAME + " AND L.queueName LIKE :" + 
DBConstants.QueueStatus.QUEUE_NAME +" ORDER BY L.time DESC";
 
     String FIND_PROCESS_WITH_STATUS = "SELECT P FROM " + 
ProcessStatusEntity.class.getSimpleName() + " P " +
             " where P.state LIKE :" + DBConstants.ProcessStatus.STATE;