This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
The following commit(s) were added to refs/heads/master by this push:
new aa2b102 bug fix
new e1d6fc8 Merge pull request #209 from isururanawaka/service_monitoring
aa2b102 is described below
commit aa2b102004ffce4849ece0d1c30c22082749b24a
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Mon Mar 27 22:30:35 2023 -0400
bug fix
---
ansible/roles/data_lake/templates/drms/application.properties.j2 | 5 ++++-
.../orchestrator/handlers/async/OrchestratorEventProcessor.java | 5 ++++-
.../drms-server/src/main/resources/application.properties | 3 +++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/data_lake/templates/drms/application.properties.j2
b/ansible/roles/data_lake/templates/drms/application.properties.j2
index 2fdd5db..54870ab 100644
--- a/ansible/roles/data_lake/templates/drms/application.properties.j2
+++ b/ansible/roles/data_lake/templates/drms/application.properties.j2
@@ -36,4 +36,7 @@ custos.secret={{ datalake_drms_custos_client_secret }}
custos.host={{ datalake_drms_custos_host }}
custos.port={{ datalake_drms_custos_port }}
-custos.authentication.skip=false
\ No newline at end of file
+custos.authentication.skip=false
+
+orch.host={{datalake_data_orch_host}}
+orch.port={{datalake_data_orch_grpc_port}}
\ No newline at end of file
diff --git
a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java
b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java
index e8e0546..daddaa7 100644
---
a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java
+++
b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java
@@ -227,6 +227,7 @@ public class OrchestratorEventProcessor implements Runnable
{
logger.error("Invalid user. User should be verified users {} .
{}", splitted[0], removeBasePath);
throw new Exception("Invalid user. User " + splitted[0] + "
should be registered users");
}
+
if (ownerOp.isEmpty()) {
this.drmsConnector.createUnverifiedResource(notification.getAuthToken(),
notification.getTenantId(),
notification.getNotificationId(),
notification.getResourcePath(), notification.getResourceType(),
@@ -234,7 +235,9 @@ public class OrchestratorEventProcessor implements Runnable
{
logger.error("Invalid user. User should be verified users {} .
{}", splitted[1], removeBasePath);
throw new Exception("Invalid user. User " + splitted[1] + "
should be registered users");
}
-
+
+ adminUser = adminUserOp.get();
+ owner = ownerOp.get();
Map<String, String> ownerRules = new HashMap<>();
ownerRules.put(adminUser, "VIEWER");
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/resources/application.properties
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/resources/application.properties
index dc749bf..7d47788 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/resources/application.properties
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/resources/application.properties
@@ -55,3 +55,6 @@ custos.id=CHANGEME
custos.secret=CHANGEME
custos.host=prod.custos.usecustos.org
custos.authentication.skip=false
+
+orch.host=localhost
+orch.port=8899
