[airavata] branch develop updated: bug fix in Orchestyrator

[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 dc1b2cfc1b bug fix in Orchestyrator
     new 80925babf1 Merge pull request #393 from isururanawaka/metaschedular
dc1b2cfc1b is described below

commit dc1b2cfc1b4b5cf3bce37a4a1e5dac4bb74f9ccd
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Wed Mar 8 15:37:24 2023 -0500

    bug fix in Orchestyrator
---
 .../orchestrator/server/OrchestratorServerHandler.java  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git 
a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
 
b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index b01dade5ce..7acb6a6bd1 100644
--- 
a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ 
b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -46,6 +46,7 @@ import org.apache.airavata.model.experiment.ExperimentType;
 import org.apache.airavata.model.experiment.UserConfigurationDataModel;
 import org.apache.airavata.model.messaging.event.*;
 import org.apache.airavata.model.process.ProcessModel;
+import 
org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
 import org.apache.airavata.model.status.ExperimentState;
 import org.apache.airavata.model.status.ExperimentStatus;
 import org.apache.airavata.model.status.ProcessState;
@@ -160,11 +161,17 @@ public class OrchestratorServerHandler implements 
OrchestratorService.Iface {
             if (groupResourceProfileId == null) {
                 throw new Exception("Experiment not configured with a Group 
Resource Profile: " + experimentId);
             }
-            GroupComputeResourcePreference groupComputeResourcePreference = 
registryClient.getGroupComputeResourcePreference(
-                    
userConfigurationData.getComputationalResourceScheduling().getResourceHostId(),
-                    groupResourceProfileId);
-            if 
(groupComputeResourcePreference.getResourceSpecificCredentialStoreToken() != 
null) {
-                token = 
groupComputeResourcePreference.getResourceSpecificCredentialStoreToken();
+
+
+            if ( userConfigurationData.getComputationalResourceScheduling() != 
null &&
+                    
userConfigurationData.getComputationalResourceScheduling().isSet(ComputationalResourceSchedulingModel._Fields.RESOURCE_HOST_ID))
 {
+                GroupComputeResourcePreference groupComputeResourcePreference 
= registryClient.getGroupComputeResourcePreference(
+                        
userConfigurationData.getComputationalResourceScheduling().getResourceHostId(),
+                        groupResourceProfileId);
+
+                if 
(groupComputeResourcePreference.getResourceSpecificCredentialStoreToken() != 
null) {
+                    token = 
groupComputeResourcePreference.getResourceSpecificCredentialStoreToken();
+                }
             }
             if (token == null || token.isEmpty()) {
                 // try with group resource profile level token