[airavata-data-lake] branch master updated: Removing resource cache temporarily

[dimuthuupe]

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

dimuthuupe 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 1d3fbe7  Removing resource cache temporarily
1d3fbe7 is described below

commit 1d3fbe7ef145f194c59c94561689086c1cc3fc50
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Wed Oct 13 23:25:23 2021 -0400

    Removing resource cache temporarily
---
 .../handlers/async/OrchestratorEventProcessor.java           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 adfdc53..6246d85 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
@@ -79,10 +79,13 @@ public class OrchestratorEventProcessor implements Runnable 
{
             String resourceName = splitted[i];
             currentPath = currentPath + "/" + resourceName;
 
-            if (resourceCache.containsKey(currentPath)) {
+            /*if (resourceCache.containsKey(currentPath)) {
                 resourceList.add(resourceCache.get(currentPath));
+                parentId = resourceCache.get(currentPath).getResourceId();
+                logger.info("Using cached resource with path {} for path {}", 
currentPath,
+                        resourceCache.get(currentPath).getResourcePath());
                 continue;
-            }
+            }*/
 
             String resourceId = Utils.getId(storageId + ":" + currentPath);
             Optional<GenericResource> optionalGenericResource =
@@ -327,6 +330,11 @@ public class OrchestratorEventProcessor implements 
Runnable {
                 this.configuration.getOutboundEventProcessor().getMftPort())) {
             MFTApiServiceGrpc.MFTApiServiceBlockingStub mftClientStub = 
mftApiClient.get();
             directoryResourceMetadata = 
mftClientStub.getDirectoryResourceMetadata(resourceMetadataReq.build());
+
+        } catch (Exception e) {
+            logger.error("Failed to fetch dir metadata for resource {} with 
path {}",
+                    resourceObj.getResourceId(), 
resourceObj.getResourcePath(), e);
+            throw e;
         }
 
         for (FileMetadataResponse fileMetadata : 
directoryResourceMetadata.getFilesList()) {