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/06/02 21:02:41 UTC
airavata git commit: To fix AIRAVATA-1710.
Repository: airavata
Updated Branches:
refs/heads/airavata-0.15-release-branch 632d6b986 -> a128eee00
To fix AIRAVATA-1710.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a128eee0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a128eee0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a128eee0
Branch: refs/heads/airavata-0.15-release-branch
Commit: a128eee003b262946fa31384add663314bac3c33
Parents: 632d6b9
Author: raminder <ra...@apache.org>
Authored: Tue Jun 2 15:02:26 2015 -0400
Committer: raminder <ra...@apache.org>
Committed: Tue Jun 2 15:02:26 2015 -0400
----------------------------------------------------------------------
.../gfac/bes/provider/impl/BESProvider.java | 25 ++++++++------------
1 file changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a128eee0/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java
index dad2a4d..299e6ef 100644
--- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java
+++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java
@@ -174,7 +174,7 @@ public class BESProvider extends AbstractProvider implements GFacProvider,
.getStringValue(), factory.getActivityStatus(activityEpr)
.toString()));
- waitUntilDone(factory, activityEpr, jobDetails);
+ waitUntilDone(eprt, activityEpr, jobDetails, secProperties);
ActivityStatusType activityStatus = null;
activityStatus = getStatus(factory, activityEpr);
@@ -300,10 +300,10 @@ public class BESProvider extends AbstractProvider implements GFacProvider,
* @param jobExecutionContext
* @throws GFacProviderException
*/
- public void cancelJob(String activityEpr,
- JobExecutionContext jobExecutionContext)
+ public boolean cancelJob(JobExecutionContext jobExecutionContext)
throws GFacProviderException {
try {
+ String activityEpr = jobExecutionContext.getJobDetails().getJobDescription();
// initSecurityProperties(jobExecutionContext);
EndpointReferenceType eprt = EndpointReferenceType.Factory
.parse(activityEpr);
@@ -321,6 +321,7 @@ public class BESProvider extends AbstractProvider implements GFacProvider,
FactoryClient factory = new FactoryClient(epr, secProperties);
factory.terminateActivity(eprt);
+ return true;
} catch (Exception e) {
throw new GFacProviderException(e.getLocalizedMessage(), e);
}
@@ -402,13 +403,6 @@ public class BESProvider extends AbstractProvider implements GFacProvider,
}
- @Override
- public boolean cancelJob(JobExecutionContext jobExecutionContext)
- throws GFacProviderException, GFacException {
- // TODO Auto-generated method stub
- return false;
- }
-
@Override
public void recover(JobExecutionContext jobExecutionContext) throws GFacProviderException, GFacException {
// TODO: Auto generated method body.
@@ -419,17 +413,18 @@ public class BESProvider extends AbstractProvider implements GFacProvider,
// TODO: Auto generated method body.
}
- protected void waitUntilDone(FactoryClient factory, EndpointReferenceType activityEpr, JobDetails jobDetails) throws Exception {
+ protected void waitUntilDone(EndpointReferenceType factoryEpr, EndpointReferenceType activityEpr, JobDetails jobDetails, DefaultClientConfiguration secProperties) throws Exception {
try {
+ FactoryClient factoryClient = new FactoryClient(factoryEpr, secProperties);
JobState applicationJobStatus = null;
- while ((factory.getActivityStatus(activityEpr) != ActivityStateEnumeration.FINISHED)
- && (factory.getActivityStatus(activityEpr) != ActivityStateEnumeration.FAILED)
- && (factory.getActivityStatus(activityEpr) != ActivityStateEnumeration.CANCELLED)
+ while ((factoryClient.getActivityStatus(activityEpr) != ActivityStateEnumeration.FINISHED)
+ && (factoryClient.getActivityStatus(activityEpr) != ActivityStateEnumeration.FAILED)
+ && (factoryClient.getActivityStatus(activityEpr) != ActivityStateEnumeration.CANCELLED)
&& (applicationJobStatus != JobState.COMPLETE)) {
- ActivityStatusType activityStatus = getStatus(factory, activityEpr);
+ ActivityStatusType activityStatus = getStatus(factoryClient, activityEpr);
applicationJobStatus = getApplicationJobStatus(activityStatus);
sendNotification(jobExecutionContext,applicationJobStatus);