airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dimuthu...@apache.org
Subject [airavata] branch develop updated: Fixing compilation failures
Date Tue, 08 Jan 2019 21:37:41 GMT
This is an automated email from the ASF dual-hosted git repository.

dimuthuupe 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 382ca0c  Fixing compilation failures
382ca0c is described below

commit 382ca0cfb8647dbefddf28de30661e0e56d8b47d
Author: Dimuthu Wannipurage <dimuthu.upeksha2@gmail.com>
AuthorDate: Tue Jan 8 16:37:31 2019 -0500

    Fixing compilation failures
---
 .../apache/airavata/helix/impl/task/parsing/DataParsingTask.java   | 2 +-
 .../apache/airavata/helix/impl/workflow/ParserWorkflowManager.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
index c50f490..e051217 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
@@ -109,7 +109,7 @@ public class DataParsingTask extends AbstractTask {
 
         try {
 
-            Parser parser = getRegistryServiceClient().getParser(parserId);
+            Parser parser = getRegistryServiceClient().getParser(parserId, gatewayId);
             String containerId = getTaskId() + "_PARSER_"+ parser.getId();
 
             String localInputDir = createLocalInputDir(containerId);
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
index d0f2b33..6494c08 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
@@ -89,7 +89,8 @@ public class ParserWorkflowManager extends WorkflowManager {
 
             // All the templates should be run
             // FIXME is it ApplicationInterfaceId or ApplicationName
-            List<ParsingTemplate> parsingTemplates = registryClient.getParsingTemplatesForExperiment(completionMessage.getExperimentId());
+            List<ParsingTemplate> parsingTemplates = registryClient.getParsingTemplatesForExperiment(completionMessage.getExperimentId(),
+                    completionMessage.getGatewayId());
 
             Map<String, Map<String, Set<ParserConnector>>> parentToChildParsers
= new HashMap<>();
 
@@ -138,7 +139,7 @@ public class ParserWorkflowManager extends WorkflowManager {
                     throw  new Exception("Could not find a parent parser for template " +
template.getId());
                 }
 
-                Parser parentParser = registryClient.getParser(parentParserId);
+                Parser parentParser = registryClient.getParser(parentParserId, completionMessage.getGatewayId());
 
                 DataParsingTask parentParserTask = createParentTask(parentParser, completionMessage,
template.getInitialInputs(), registryClient);
 
@@ -249,7 +250,7 @@ public class ParserWorkflowManager extends WorkflowManager {
         if (parentToChild.containsKey(parentParserInfo.getId())) {
 
             for (ParserConnector connector : parentToChild.get(parentParserInfo.getId()))
{
-                Parser childParserInfo = registryClient.getParser(connector.getChildParserId());
+                Parser childParserInfo = registryClient.getParser(connector.getChildParserId(),
completionMessage.getGatewayId());
                 DataParsingTask parsingTask = new DataParsingTask();
                 parsingTask.setTaskId(normalizeTaskId(completionMessage.getExperimentId()
+ "-" + childParserInfo.getId() + "-" + UUID.randomUUID().toString()));
                 parsingTask.setGatewayId(completionMessage.getGatewayId());


Mime
View raw message