Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 57A1F200B62 for ; Thu, 7 Jul 2016 21:29:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 568A6160A4F; Thu, 7 Jul 2016 19:29:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0343F160AA3 for ; Thu, 7 Jul 2016 21:29:50 +0200 (CEST) Received: (qmail 65917 invoked by uid 500); 7 Jul 2016 19:29:50 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 62965 invoked by uid 99); 7 Jul 2016 19:29:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jul 2016 19:29:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5D60EAD93; Thu, 7 Jul 2016 19:29:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Thu, 07 Jul 2016 19:30:34 -0000 Message-Id: In-Reply-To: <19c725741cd34970a324f6eab174e4f9@git.apache.org> References: <19c725741cd34970a324f6eab174e4f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/53] [abbrv] airavata git commit: Changed data staging task to work with multiple inputs archived-at: Thu, 07 Jul 2016 19:29:53 -0000 Changed data staging task to work with multiple inputs Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/73fee6be Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/73fee6be Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/73fee6be Branch: refs/heads/master Commit: 73fee6be73c9265e637475e6c4443b895fe9556c Parents: d20f77e Author: Shameera Rathnayaka Authored: Wed Jul 6 14:31:14 2016 -0400 Committer: Shameera Rathnayaka Committed: Wed Jul 6 14:32:05 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java | 4 +++- .../java/org/apache/airavata/gfac/impl/task/DataStageTask.java | 3 +-- .../org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/73fee6be/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java index 3fb95e0..f64e521 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java @@ -529,7 +529,7 @@ public class GFacEngineImpl implements GFacEngine { return false; } - private boolean inputDataStaging(TaskContext taskContext, boolean recover) throws GFacException { + private boolean inputDataStaging(TaskContext taskContext, boolean recover) throws GFacException, TException { TaskStatus taskStatus = new TaskStatus(TaskState.EXECUTING); taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime()); taskContext.setTaskStatus(taskStatus); @@ -541,8 +541,10 @@ public class GFacEngineImpl implements GFacEngine { if (taskContext.getProcessInput().getType() == DataType.URI_COLLECTION) { String values = taskContext.getProcessInput().getValue(); String[] multiple_inputs = values.split(GFacConstants.MULTIPLE_INPUTS_SPLITTER); + DataStagingTaskModel subTaskModel = (DataStagingTaskModel) taskContext.getSubTaskModel(); for (String input : multiple_inputs) { taskContext.getProcessInput().setValue(input); + subTaskModel.setSource(input); taskStatus = executeTask(taskContext, dMoveTask, false); } taskContext.getProcessInput().setValue(values); http://git-wip-us.apache.org/repos/asf/airavata/blob/73fee6be/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java index ec3ffd7..69e8d77 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java @@ -56,8 +56,7 @@ public class DataStageTask implements Task { + taskContext.getTaskModel().getTaskType().toString()); } else { try { - DataStagingTaskModel subTaskModel = (DataStagingTaskModel) ThriftUtils.getSubTaskModel(taskContext - .getTaskModel()); + DataStagingTaskModel subTaskModel = ((DataStagingTaskModel) taskContext.getSubTaskModel()); URI sourceURI = new URI(subTaskModel.getSource()); URI destinationURI = new URI(subTaskModel.getDestination()); http://git-wip-us.apache.org/repos/asf/airavata/blob/73fee6be/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java index 17522e9..904d486 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java @@ -83,8 +83,7 @@ public class SCPDataStageTask implements Task { String localDataDir = null; ProcessState processState = taskContext.getParentProcessContext().getProcessState(); try { - subTaskModel = (DataStagingTaskModel) ThriftUtils.getSubTaskModel - (taskContext.getTaskModel()); + subTaskModel = ((DataStagingTaskModel) taskContext.getSubTaskModel()); if (processState == ProcessState.OUTPUT_DATA_STAGING) { OutputDataObjectType processOutput = taskContext.getProcessOutput(); if (processOutput != null && processOutput.getValue() == null) {