You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/05/18 17:44:40 UTC
airavata git commit: Fixed state change issue with recovery of
relaunch operation.
Repository: airavata
Updated Branches:
refs/heads/master 0a3ab51f8 -> c4b8fb21a
Fixed state change issue with recovery of relaunch operation.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c4b8fb21
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c4b8fb21
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c4b8fb21
Branch: refs/heads/master
Commit: c4b8fb21a564cd39676fead8046fdd4087d4a49f
Parents: 0a3ab51
Author: shamrath <sh...@gmail.com>
Authored: Mon May 18 11:44:38 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Mon May 18 11:44:38 2015 -0400
----------------------------------------------------------------------
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4b8fb21/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 4e30bf5..9f31e7e 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
@@ -488,20 +488,12 @@ public class BetterGfacImpl implements GFac,Watcher {
// We need to check whether this job is submitted as a part of a large workflow. If yes,
// we need to setup workflow tracking listerner.
try {
- String experimentEntry = GFacUtils.findExperimentEntry(jobExecutionContext.getExperimentID(), zk);
GfacExperimentState gfacExpState = GFacUtils.getZKExperimentState(zk, jobExecutionContext); // this is the original state came, if we query again it might be different,so we preserve this state in the environment
- monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext)
- , GfacExperimentState.ACCEPTED)); // immediately we get the request we update the status
- String workflowInstanceID = null;
- if ((workflowInstanceID = (String) jobExecutionContext.getProperty(Constants.PROP_WORKFLOW_INSTANCE_ID)) != null) {
- // This mean we need to register workflow tracking listener.
- //todo implement WorkflowTrackingListener properly
-// registerWorkflowTrackingListener(workflowInstanceID, jobExecutionContext);
- }
// Register log event listener. This is required in all scenarios.
- jobExecutionContext.getNotificationService().registerListener(new LoggingListener());
if (isNewJob(gfacExpState)) {
// In this scenario We do everything from the beginning
+ monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext)
+ , GfacExperimentState.ACCEPTED)); // immediately we get the request we update the status
launch(jobExecutionContext);
} else if (isCompletedJob(gfacExpState)) {
log.info("There is nothing to recover in this job so we do not re-submit");
@@ -513,15 +505,9 @@ public class BetterGfacImpl implements GFac,Watcher {
reLaunch(jobExecutionContext, gfacExpState);
}
return true;
- } catch (ApplicationSettingsException e) {
- GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR);
- throw new GFacException("Error launching the Job", e);
- } catch (KeeperException e) {
+ } catch (Exception e) {
GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR);
throw new GFacException("Error launching the Job", e);
- } catch (InterruptedException e) {
- GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR);
- throw new GFacException("Error launching the Job",e);
}
}