You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/04/06 01:38:52 UTC
[airavata] branch develop updated (e45108a -> 06f8435)
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from e45108a Checking the existence of output file before transferring
new 7bb426a Checking the archive transfer status in ArchivingTask
new 06f8435 Checking full file path in validating file existence in SSHAgentAdaptor
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java | 4 ++--
.../org/apache/airavata/helix/impl/task/staging/ArchiveTask.java | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.
[airavata] 02/02: Checking full file path in validating file
existence in SSHAgentAdaptor
Posted by di...@apache.org.
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
commit 06f8435f875bde0bac09ac0e64584f3e0617138d
Author: dimuthu <di...@gmail.com>
AuthorDate: Thu Apr 5 21:38:45 2018 -0400
Checking full file path in validating file existence in SSHAgentAdaptor
---
.../java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java
index 702afe7..bf899e0 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java
+++ b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java
@@ -505,10 +505,10 @@ public class SshAgentAdaptor implements AgentAdaptor {
logger.info("No file found for given path " + filePath);
return false;
} else {
- if (potentialFiles[0].trim().equals(new File(filePath).getName())) {
+ if (potentialFiles[0].trim().equals(filePath)) {
return true;
} else {
- logger.info("Returned file name " + potentialFiles[0].trim() + " does not match with given name " + new File(filePath).getName());
+ logger.info("Returned file name " + potentialFiles[0].trim() + " does not match with given name " + filePath);
return false;
}
}
--
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.
[airavata] 01/02: Checking the archive transfer status in
ArchivingTask
Posted by di...@apache.org.
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
commit 7bb426a243135e97cda181850fa6b48f1d5e059d
Author: dimuthu <di...@gmail.com>
AuthorDate: Thu Apr 5 21:37:48 2018 -0400
Checking the archive transfer status in ArchivingTask
---
.../org/apache/airavata/helix/impl/task/staging/ArchiveTask.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java
index ddea270..4f1129f 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java
@@ -94,7 +94,12 @@ public class ArchiveTask extends DataStagingTask {
throw new TaskOnFailException("Failed while running the tar command " + tarringCommand, true, null);
}
- transferFileToStorage(tarCreationAbsPath, destFilePath, archiveFileName, adaptor, storageResourceAdaptor);
+ boolean fileTransferred = transferFileToStorage(tarCreationAbsPath, destFilePath, archiveFileName, adaptor, storageResourceAdaptor);
+
+ if (!fileTransferred) {
+ logger.error("Failed to transfer created archive file " + tarCreationAbsPath);
+ throw new TaskOnFailException("Failed to transfer created archive file " + tarCreationAbsPath, true, null);
+ }
String deleteTarCommand = "rm " + tarCreationAbsPath;
logger.info("Running delete temporary tar command " + deleteTarCommand);
--
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.