(airavata) branch master updated: log registry client host:port before connecting. fix error in DataProductRepository

[yasith]

This is an automated email from the ASF dual-hosted git repository.

yasith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new b65c27354c log registry client host:port before connecting. fix error 
in DataProductRepository
b65c27354c is described below

commit b65c27354c6150ac15ac92e2ac2f75fb90414539
Author: yasithdev <yasit...@icloud.com>
AuthorDate: Tue Jul 15 13:07:17 2025 -0500

    log registry client host:port before connecting. fix error in 
DataProductRepository
---
 .../org/apache/airavata/helix/impl/task/AiravataTask.java   | 13 ++++++++++---
 .../repositories/replicacatalog/DataProductRepository.java  |  6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git 
a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
 
b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
index 804f222b20..f5f06c35ac 100644
--- 
a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
+++ 
b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
@@ -645,11 +645,18 @@ public abstract class AiravataTask extends AbstractTask {
 
     // TODO this is inefficient. Try to use a connection pool
     public static RegistryService.Client getRegistryServiceClient() {
+        final String serverHost;
+        final int serverPort;
         try {
-            final int serverPort = 
Integer.parseInt(ServerSettings.getRegistryServerPort());
-            final String serverHost = ServerSettings.getRegistryServerHost();
+            serverPort = 
Integer.parseInt(ServerSettings.getRegistryServerPort());
+            serverHost = ServerSettings.getRegistryServerHost();
+        } catch (ApplicationSettingsException e) {
+            throw new RuntimeException("Unable to get registry server host or 
port...", e);
+        }
+        try {
+            logger.info("Connecting to registry server on {}:{}", serverHost, 
serverPort);
             return 
RegistryServiceClientFactory.createRegistryClient(serverHost, serverPort);
-        } catch (RegistryServiceException | ApplicationSettingsException e) {
+        } catch (RegistryServiceException e) {
             throw new RuntimeException("Unable to create registry client...", 
e);
         }
     }
diff --git 
a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepository.java
 
b/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepository.java
index 3d0dadbbfb..c9fc69d68a 100644
--- 
a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepository.java
+++ 
b/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepository.java
@@ -83,8 +83,6 @@ public class DataProductRepository extends 
RepCatAbstractRepository<DataProductM
         }
 
         if (dataProductEntity.getReplicaLocations() != null) {
-            // set replica validity for 7 days
-            final Timestamp validUntilTime = new 
Timestamp(currentTime.getTime() + Duration.ofDays(7).toMillis());
             logger.debug("Populating the product URI for ReplicaLocations 
objects for the Data Product");
             
dataProductEntity.getReplicaLocations().forEach(dataReplicaLocationEntity -> {
                 dataReplicaLocationEntity.setProductUri(productUri);
@@ -95,7 +93,9 @@ public class DataProductRepository extends 
RepCatAbstractRepository<DataProductM
                     dataReplicaLocationEntity.setCreationTime(currentTime);
                 }
                 dataReplicaLocationEntity.setLastModifiedTime(currentTime);
-                dataReplicaLocationEntity.setValidUntilTime(validUntilTime);
+                // set replica validity for 7 days
+                dataReplicaLocationEntity.setValidUntilTime(
+                        new Timestamp(currentTime.getTime() + 
Duration.ofDays(7).toMillis()));
             });
         }