You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/08/11 19:21:15 UTC
[airavata-data-lake] branch master updated: Bug fix in resource entity class
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 b849e31 Bug fix in resource entity class
new 49d253e Merge pull request #123 from isururanawaka/mysql_conversion
b849e31 is described below
commit b849e31e75dd3f7472528609ca5deed83c336f2e
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Thu Aug 11 15:17:17 2022 -0400
Bug fix in resource entity class
---
ansible/datalake.yml | 20 +++++++--------
.../prod-deployment/group_vars/all/vars.yml | 2 +-
ansible/inventories/test/group_vars/all/vars.yml | 2 +-
ansible/roles/data_lake/tasks/main.yml | 2 +-
.../templates/drms/application.properties.j2 | 29 ++++++++++++++++++----
.../drms/api/persistance/model/Resource.java | 4 +--
.../api/persistance/model/TransferMapping.java | 4 +--
7 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/ansible/datalake.yml b/ansible/datalake.yml
index b98dbf0..8d6ddf2 100644
--- a/ansible/datalake.yml
+++ b/ansible/datalake.yml
@@ -21,16 +21,16 @@
---
- hosts: data-lake
roles:
- - env_setup
- - zookeeper
- - kafka
- - custos
+# - env_setup
+# - zookeeper
+# - kafka
+# - custos
- consul
- data_lake
- - mft
- - workflow-engine
+# - mft
+# - workflow-engine
-- hosts: emc-portal
- roles:
- - env_setup
- - emc_portal
+#- hosts: emc-portal
+# roles:
+# - env_setup
+# - emc_portal
diff --git a/ansible/inventories/prod-deployment/group_vars/all/vars.yml b/ansible/inventories/prod-deployment/group_vars/all/vars.yml
index 3be5d7a..544063a 100644
--- a/ansible/inventories/prod-deployment/group_vars/all/vars.yml
+++ b/ansible/inventories/prod-deployment/group_vars/all/vars.yml
@@ -46,7 +46,7 @@ mft_distribution_version: 0.01
custos_source_dir: "{{ user_home }}/custos-source"
custos_repo: "https://github.com/apache/airavata-custos.git"
-custos_git_branch: develop
+custos_git_branch: baremetal
mft_default_agent_id: agent0
mft_default_agent_host: "{{ ansible_default_ipv4.address }}"
diff --git a/ansible/inventories/test/group_vars/all/vars.yml b/ansible/inventories/test/group_vars/all/vars.yml
index a79a0c3..b60f539 100644
--- a/ansible/inventories/test/group_vars/all/vars.yml
+++ b/ansible/inventories/test/group_vars/all/vars.yml
@@ -47,7 +47,7 @@ mft_distribution_version: 0.01
custos_source_dir: "{{ user_home }}/custos-source"
custos_repo: "https://github.com/apache/airavata-custos.git"
-custos_git_branch: develop
+custos_git_branch: baremetal
mft_default_agent_id: agent0
mft_default_agent_host: "{{ ansible_default_ipv4.address }}"
diff --git a/ansible/roles/data_lake/tasks/main.yml b/ansible/roles/data_lake/tasks/main.yml
index 631cd59..de87432 100644
--- a/ansible/roles/data_lake/tasks/main.yml
+++ b/ansible/roles/data_lake/tasks/main.yml
@@ -159,7 +159,7 @@
unarchive: "src={{ datalake_source_dir }}/{{ item }}
dest={{ datalake_deployment_dir }}/ copy=no"
with_items:
- - "data-resource-management-service/drms-api/target/DRMS-{{datalake_distribution_version}}-bin.zip"
+ - "data-resource-management-service/drms-rdbms-impl/drms-server/target/DRMS-{{datalake_distribution_version}}-bin.zip"
- "data-resource-management-service/drms-custos-synchronizer/target/DRMS-Custos-Synchronizer-{{datalake_distribution_version}}-bin.zip"
- "data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/target/Orchestrator-API-Service-{{datalake_distribution_version}}-bin.zip"
become: yes
diff --git a/ansible/roles/data_lake/templates/drms/application.properties.j2 b/ansible/roles/data_lake/templates/drms/application.properties.j2
index 8353e73..2ffd152 100644
--- a/ansible/roles/data_lake/templates/drms/application.properties.j2
+++ b/ansible/roles/data_lake/templates/drms/application.properties.j2
@@ -15,13 +15,32 @@
# limitations under the License.
#
-neo4j.server.uri={{ datalake_drms_neo4j_uri }}
-neo4j.server.user={{ datalake_drms_neo4j_user }}
-neo4j.server.password={{ datalake_drms_neo4j_password }}
+
+grpc.port={{ datalake_drms_grpc_port }}
+server.port={{ datalake_drms_http_port }}
+custos.authentication.skip=false
+
+spring.datasource.url=jdbc:mysql://scigap12.sciencegateways.iu.edu:3306/data_catalog?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true
+spring.datasource.username=CHANGE_ME
+spring.datasource.password=CHANGE_ME
+
+## Hibernate Properties
+# The SQL dialect makes Hibernate generate better SQL for the chosen database
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
+# Hibernate ddl auto (create, create-drop, validate, update)
+spring.jpa.hibernate.ddl-auto = update
+spring.datasource.driver-class-name= com.mysql.cj.jdbc.Driver
+spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+
+
+group.service.host=localhost
+group.service.port=6565
custos.id={{ datalake_drms_custos_client_id }}
custos.secret={{ datalake_drms_custos_client_secret }}
custos.host={{ datalake_drms_custos_host }}
custos.port={{ datalake_drms_custos_port }}
-grpc.port={{ datalake_drms_grpc_port }}
-server.port={{ datalake_drms_http_port }}
+grpc.port=7070
+local.grpc.port=7070
+server.port=8081
custos.authentication.skip=false
\ No newline at end of file
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/Resource.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/Resource.java
index 972524d..18c6e73 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/Resource.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/Resource.java
@@ -22,10 +22,10 @@ public class Resource {
@Column
private String type;
- @OneToMany(fetch = FetchType.EAGER, mappedBy = "property", orphanRemoval = true, cascade = CascadeType.ALL)
+ @OneToMany(fetch = FetchType.EAGER, mappedBy = "resource", orphanRemoval = true, cascade = CascadeType.ALL)
private Set<ResourceProperty> resourceProperty;
- @OneToMany(fetch = FetchType.EAGER, mappedBy = "transferMapping", orphanRemoval = true, cascade = CascadeType.ALL)
+ @OneToMany(fetch = FetchType.EAGER, mappedBy = "resource", orphanRemoval = true, cascade = CascadeType.ALL)
private Set<TransferMapping> transferMapping;
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/TransferMapping.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/TransferMapping.java
index 845099e..a89dfdf 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/TransferMapping.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/TransferMapping.java
@@ -15,11 +15,11 @@ public class TransferMapping {
private String id;
@ManyToOne
- @JoinColumn(name = "source_id")
+ @JoinColumn(name = "resource_id")
private Resource source;
@ManyToOne
- @JoinColumn(name = "destination_id")
+ @JoinColumn(name = "resource_id")
private Resource destination;
@Column