airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata git commit: ignoring unresolved wildcard files
Date Fri, 23 Jun 2017 17:18:51 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 78f089582 -> f0f6b3404


ignoring unresolved wildcard files


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f0f6b340
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f0f6b340
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f0f6b340

Branch: refs/heads/develop
Commit: f0f6b3404866ac6d2056ba74dd6cc9591796d443
Parents: 78f0895
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Fri Jun 23 13:18:47 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Fri Jun 23 13:18:47 2017 -0400

----------------------------------------------------------------------
 .../airavata/gfac/impl/task/SCPDataStageTask.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/f0f6b340/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 138f4d9..745315d 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
@@ -273,12 +273,16 @@ public class SCPDataStageTask implements Task {
         /**
          * scp third party file transfer 'from' comute resource.
          */
-        taskContext.getParentProcessContext().getDataMovementRemoteCluster().scpThirdParty(sourceURI.getPath(),
-                destinationURI.getPath(), sshSession, RemoteCluster.DIRECTION.TO, true);
-        // update output locations
-        GFacUtils.saveExperimentOutput(taskContext.getParentProcessContext(), taskContext.getProcessOutput().getName(),
destinationURI.toString());
-        GFacUtils.saveProcessOutput(taskContext.getParentProcessContext(), taskContext.getProcessOutput().getName(),
destinationURI.toString());
-
+        //Wildcard file path has not been resolved and cannot be handled. Hence ignoring
+        if(!destinationURI.toString().contains("*")){
+            taskContext.getParentProcessContext().getDataMovementRemoteCluster().scpThirdParty(sourceURI.getPath(),
+                    destinationURI.getPath(), sshSession, RemoteCluster.DIRECTION.TO, true);
+            // update output locations
+            GFacUtils.saveExperimentOutput(taskContext.getParentProcessContext(), taskContext.getProcessOutput().getName(),
destinationURI.toString());
+            GFacUtils.saveProcessOutput(taskContext.getParentProcessContext(), taskContext.getProcessOutput().getName(),
destinationURI.toString());
+        }else{
+            log.warn("Destination file path contains unresolved wildcards. Path: " + destinationURI.toString());
+        }
     }
 
     private void makeDir(TaskContext taskContext, URI pathURI) throws GFacException {


Mime
View raw message