You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2015/04/15 18:43:33 UTC
[1/2] airavata git commit: Fixeded Airavata-1661.
Repository: airavata
Updated Branches:
refs/heads/master 2dde0d3aa -> 8a7913fad
Fixeded Airavata-1661.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1742c492
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1742c492
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1742c492
Branch: refs/heads/master
Commit: 1742c4929662c2e26e3d04383b073023b5dae06d
Parents: 73c8337
Author: raminder <ra...@apache.org>
Authored: Wed Apr 15 12:42:59 2015 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Apr 15 12:42:59 2015 -0400
----------------------------------------------------------------------
.../airavata/gfac/core/monitor/AiravataJobStatusUpdator.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1742c492/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
index c08ea51..0af8df0 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
@@ -90,9 +90,11 @@ public class AiravataJobStatusUpdator implements AbstractActivityListener {
details = new JobDetails();
}
org.apache.airavata.model.workspace.experiment.JobStatus status = new org.apache.airavata.model.workspace.experiment.JobStatus();
- if(!JobState.CANCELED.equals(details.getJobStatus().getJobState())&&
- !JobState.CANCELING.equals(details.getJobStatus().getJobState())) {
- status.setJobState(state);
+ if(JobState.CANCELED.equals(details.getJobStatus().getJobState())||
+ JobState.CANCELING.equals(details.getJobStatus().getJobState())) {
+ status.setJobState(details.getJobStatus().getJobState());
+ }else{
+ status.setJobState(state);
}
status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
details.setJobStatus(status);
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8a7913fa
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8a7913fa
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8a7913fa
Branch: refs/heads/master
Commit: 8a7913fad430e52f11461ed6e9a1795f1d072546
Parents: 1742c49 2dde0d3
Author: raminder <ra...@apache.org>
Authored: Wed Apr 15 12:43:12 2015 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Apr 15 12:43:12 2015 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/server/GfacServer.java | 2 ++
.../airavata/gfac/server/GfacServerHandler.java | 5 +++--
.../gfac/core/utils/GFacThreadPoolExecutor.java | 3 ++-
.../gfac/monitor/email/EmailBasedMonitor.java | 16 +++++++++-----
.../monitor/email/parser/PBSEmailParser.java | 22 ++++++++++++--------
.../monitor/email/parser/SLURMEmailParser.java | 14 ++++++-------
.../monitor/impl/pull/qstat/HPCPullMonitor.java | 8 +++----
7 files changed, 42 insertions(+), 28 deletions(-)
----------------------------------------------------------------------