You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/01/16 04:33:15 UTC
airavata git commit: update fail count in monitor,
post job command saving error
Repository: airavata
Updated Branches:
refs/heads/master dba25a407 -> e8eef3bee
update fail count in monitor, post job command saving error
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e8eef3be
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e8eef3be
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e8eef3be
Branch: refs/heads/master
Commit: e8eef3beecde5ebcfa37abeb53730373813dc886
Parents: dba25a4
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Jan 15 22:32:58 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu Jan 15 22:32:58 2015 -0500
----------------------------------------------------------------------
.../catalog/data/impl/ApplicationDeploymentImpl.java | 6 +++---
.../java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 2 +-
.../airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e8eef3be/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
index c82ba6a..5b90ca6 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
@@ -92,7 +92,7 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment {
List<String> postJobCommands = deploymentDescription.getPostJobCommands();
if (postJobCommands != null && !postJobCommands.isEmpty()){
for (String cmd : postJobCommands){
- PreJobCommandResource cmdResource = new PreJobCommandResource();
+ PostJobCommandResource cmdResource = new PostJobCommandResource();
cmdResource.setAppDeploymentId(deploymentDescription.getAppDeploymentId());
cmdResource.setCommand(cmd);
cmdResource.save();
@@ -211,9 +211,9 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment {
PostJobCommandResource postJobCommandResource = new PostJobCommandResource();
ids = new HashMap<String, String>();
- ids.put(AbstractResource.PreJobCommandConstants.DEPLOYMENT_ID, deploymentId);
+ ids.put(AbstractResource.PostJobCommandConstants.DEPLOYMENT_ID, deploymentId);
postJobCommandResource.remove(ids);
- List<String> postJobCommands = updatedDeployment.getPreJobCommands();
+ List<String> postJobCommands = updatedDeployment.getPostJobCommands();
if (postJobCommands != null && !postJobCommands.isEmpty()){
for (String cmd : postJobCommands){
ids = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/airavata/blob/e8eef3be/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 3b50228..dc7a28d 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -381,7 +381,7 @@ public class BetterGfacImpl implements GFac,Watcher {
}
for (OutputDataObjectType objectType : taskOutputs){
- if (objectType.isRequiredToAddedToCommandLine()){
+ if (objectType.getType() == DataType.URI && objectType.getValue() != null){
objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + objectType.getValue());
}
if (objectType.getType() == DataType.STDOUT){
http://git-wip-us.apache.org/repos/asf/airavata/blob/e8eef3be/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
index 3691a71..b7f08a6 100644
--- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
+++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
@@ -55,7 +55,7 @@ import java.util.concurrent.LinkedBlockingQueue;
public class HPCPullMonitor extends PullMonitor {
private final static AiravataLogger logger = AiravataLoggerFactory.getLogger(HPCPullMonitor.class);
- public static final int FAILED_COUNT = 1;
+ public static final int FAILED_COUNT = 5;
// I think this should use DelayedBlocking Queue to do the monitoring*/
private BlockingQueue<UserMonitorData> queue;