You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/16 01:37:40 UTC
[1/4] airavata git commit: change permisson of archive files
Repository: airavata
Updated Branches:
refs/heads/master 6ebc2b39b -> 63d742bdc
change permisson of archive files
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c36aa15d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c36aa15d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c36aa15d
Branch: refs/heads/master
Commit: c36aa15d8c40bf647e5d851084d5c9b3ffd8aca0
Parents: 4968ee8
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Mar 14 11:57:55 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Mar 14 11:57:55 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c36aa15d/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
index ae44997..61cea82 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
@@ -140,7 +140,8 @@ public class ArchiveTask implements Task {
String destParent = destPath.substring(0, destPath.lastIndexOf("/"));
String storageArchiveDir = "ARCHIVE";
commandInfo = new RawCommandInfo("cd " + destParent + " && mkdir " + storageArchiveDir +
- " && tar -xvf " + archiveTar + " -C " + storageArchiveDir + " && rm " + archiveTar);
+ " && tar -xvf " + archiveTar + " -C " + storageArchiveDir + " && rm " + archiveTar +
+ " && chmod 744 -R " + storageArchiveDir + "/*");
executeCommand(sshSession, commandInfo, new StandardOutReader());
} catch (GFacException | AiravataException | URISyntaxException | SSHApiException e) {
String msg = "Error! Archive task failed";
[2/4] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by sm...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/887ea094
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/887ea094
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/887ea094
Branch: refs/heads/master
Commit: 887ea094f6c7ba6f46e573d75ed85f56f1c50807
Parents: c36aa15 6ebc2b3
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Mar 14 11:58:10 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Mar 14 11:58:10 2016 -0400
----------------------------------------------------------------------
.../src/main/resources/bin/airavata-server.bat | 2 +-
.../src/main/resources/bin/airavata-server.sh | 8 ++---
.../src/main/resources/bin/api-server.sh | 6 ++--
.../src/main/resources/bin/gfac-server.sh | 6 ++--
.../main/resources/bin/orchestrator-server.sh | 6 ++--
distribution/src/main/resources/bin/setenv.bat | 14 ++------
distribution/src/main/resources/bin/setenv.sh | 37 ++------------------
.../src/main/resources/bin/workflow-server.sh | 6 ++--
.../main/resources/samples/registerSample.sh | 3 +-
.../main/resources/airavata-server.properties | 2 +-
.../src/main/resources/db-migrate.sh | 3 +-
11 files changed, 20 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
[3/4] airavata git commit: Change archive file permissions to 755
Posted by sm...@apache.org.
Change archive file permissions to 755
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a9a331a8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a9a331a8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a9a331a8
Branch: refs/heads/master
Commit: a9a331a85093118ea1a112883bf6bfa1ab649ade
Parents: 887ea09
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Mar 14 16:21:26 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Mar 14 16:21:26 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a9a331a8/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
index 61cea82..072547b 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
@@ -141,7 +141,7 @@ public class ArchiveTask implements Task {
String storageArchiveDir = "ARCHIVE";
commandInfo = new RawCommandInfo("cd " + destParent + " && mkdir " + storageArchiveDir +
" && tar -xvf " + archiveTar + " -C " + storageArchiveDir + " && rm " + archiveTar +
- " && chmod 744 -R " + storageArchiveDir + "/*");
+ " && chmod 755 -R " + storageArchiveDir + "/*");
executeCommand(sshSession, commandInfo, new StandardOutReader());
} catch (GFacException | AiravataException | URISyntaxException | SSHApiException e) {
String msg = "Error! Archive task failed";
[4/4] airavata git commit: changing output data staging according to
- AIRAVATA-1909
Posted by sm...@apache.org.
changing output data staging according to - AIRAVATA-1909
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/63d742bd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/63d742bd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/63d742bd
Branch: refs/heads/master
Commit: 63d742bdc438ebc948586e64437657282b7230a3
Parents: a9a331a
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Mar 15 20:36:23 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Mar 15 20:36:23 2016 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/impl/task/SCPDataStageTask.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/63d742bd/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 0df3c4e..22281de 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
@@ -287,16 +287,15 @@ public class SCPDataStageTask implements Task {
public URI getDestinationURI(TaskContext taskContext, String fileName) throws URISyntaxException {
String experimentDataDir = taskContext.getParentProcessContext().getProcessModel().getExperimentDataDir();
- String filePath;
+ String filePath = "";
if(experimentDataDir != null && !experimentDataDir.isEmpty()) {
- if(experimentDataDir.startsWith(File.separator)){
- experimentDataDir = experimentDataDir.substring(1);
- }
if(!experimentDataDir.endsWith(File.separator)){
experimentDataDir += File.separator;
}
- filePath = (inputPath.endsWith(File.separator) ? inputPath : inputPath + File.separator) + experimentDataDir +
- taskContext.getParentProcessContext().getProcessId() + File.separator + fileName;
+ if(!experimentDataDir.startsWith(File.separator)){
+ filePath = (inputPath.endsWith(File.separator) ? inputPath : inputPath + File.separator);
+ }
+ filePath = filePath + experimentDataDir + fileName;
} else {
filePath =(inputPath.endsWith(File.separator) ? inputPath : inputPath + File.separator) +
taskContext.getParentProcessContext().getProcessId() + File.separator + fileName;