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/11/23 20:54:02 UTC
[1/2] airavata git commit: set process cancel property when cancel
watcher triger
Repository: airavata
Updated Branches:
refs/heads/develop ca89eaee4 -> 9e4dccffc
set process cancel property when cancel watcher triger
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9943dbff
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9943dbff
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9943dbff
Branch: refs/heads/develop
Commit: 9943dbff2857be3f4f4ae2ce5acbf343ce864b1d
Parents: 6aaea39
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Nov 23 14:52:29 2015 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Nov 23 14:52:29 2015 -0500
----------------------------------------------------------------------
.../airavata/gfac/impl/GFacEngineImpl.java | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9943dbff/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
index d59f460..69aeb12 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
@@ -580,11 +580,21 @@ public class GFacEngineImpl implements GFacEngine {
@Override
public void cancelProcess(ProcessContext processContext) throws GFacException {
- if (processContext.getProcessState() == ProcessState.MONITORING) {
- // get job submission task and invoke cancel
- JobSubmissionTask jobSubmissionTask = Factory.getJobSubmissionTask(processContext.getJobSubmissionProtocol());
- TaskContext taskCtx = getJobSubmissionTaskContext(processContext);
- executeCancel(taskCtx, jobSubmissionTask);
+ if (processContext != null) {
+ processContext.setCancel(true);
+ switch (processContext.getProcessState()) {
+ case MONITORING:
+ // get job submission task and invoke cancel
+ JobSubmissionTask jobSubmissionTask = Factory.getJobSubmissionTask(processContext.getJobSubmissionProtocol());
+ TaskContext taskCtx = getJobSubmissionTaskContext(processContext);
+ executeCancel(taskCtx, jobSubmissionTask);
+ break;
+ case COMPLETED: case FAILED: case CANCELED : case CANCELLING:
+ log.warn("Process cancel trigger for already {} process", processContext.getProcessState().name());
+ break;
+ default:
+ break;
+ }
}
}
[2/2] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by sh...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9e4dccff
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9e4dccff
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9e4dccff
Branch: refs/heads/develop
Commit: 9e4dccffc79655c44d66cd82166c3b04bed13ff7
Parents: 9943dbf ca89eae
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Nov 23 14:53:21 2015 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Nov 23 14:53:21 2015 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 250 +-
.../java/org/apache/airavata/api/Airavata.java | 25818 +++++++++++------
.../main/resources/lib/airavata/Airavata.cpp | 9879 ++++---
.../src/main/resources/lib/airavata/Airavata.h | 2043 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 185 +-
.../resources/lib/airavata/airavata_api_types.h | 2 +
.../lib/airavata/airavata_data_models_types.h | 1 +
.../airavata/compute_resource_model_types.cpp | 1288 +-
.../lib/airavata/compute_resource_model_types.h | 311 +-
.../airavata/data_movement_models_constants.cpp | 34 +
.../airavata/data_movement_models_constants.h | 41 +
.../lib/airavata/data_movement_models_types.cpp | 763 +
.../lib/airavata/data_movement_models_types.h | 327 +
.../lib/airavata/experiment_model_types.cpp | 406 +-
.../lib/airavata/experiment_model_types.h | 31 +-
.../gateway_resource_profile_model_types.cpp | 88 +-
.../gateway_resource_profile_model_types.h | 55 +-
.../lib/airavata/process_model_types.cpp | 26 +-
.../lib/airavata/process_model_types.h | 16 +-
.../storage_resource_model_constants.cpp | 34 +
.../airavata/storage_resource_model_constants.h | 41 +
.../airavata/storage_resource_model_types.cpp | 235 +
.../lib/airavata/storage_resource_model_types.h | 116 +
.../resources/lib/airavata/task_model_types.cpp | 206 +-
.../resources/lib/airavata/task_model_types.h | 22 +-
.../resources/lib/Airavata/API/Airavata.php | 6474 +++--
.../Model/AppCatalog/ComputeResource/Types.php | 943 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 50 +-
.../Model/AppCatalog/StorageResource/Types.php | 232 +
.../lib/Airavata/Model/Data/Movement/Types.php | 742 +
.../lib/Airavata/Model/Experiment/Types.php | 210 +-
.../lib/Airavata/Model/Process/Types.php | 23 +
.../resources/lib/Airavata/Model/Task/Types.php | 51 +
.../src/main/resources/lib/Types.php | 20 +
.../lib/apache/airavata/api/Airavata-remote | 114 +-
.../lib/apache/airavata/api/Airavata.py | 4418 ++-
.../resources/lib/apache/airavata/api/ttypes.py | 2 +
.../model/appcatalog/computeresource/ttypes.py | 700 +-
.../model/appcatalog/gatewayprofile/ttypes.py | 51 +-
.../appcatalog/storageresource/__init__.py | 1 +
.../appcatalog/storageresource/constants.py | 11 +
.../model/appcatalog/storageresource/ttypes.py | 167 +
.../lib/apache/airavata/model/data/__init__.py | 0
.../airavata/model/data/movement/__init__.py | 1 +
.../airavata/model/data/movement/constants.py | 11 +
.../airavata/model/data/movement/ttypes.py | 625 +
.../apache/airavata/model/experiment/ttypes.py | 140 +-
.../lib/apache/airavata/model/process/ttypes.py | 15 +-
.../lib/apache/airavata/model/task/ttypes.py | 26 +-
.../lib/apache/airavata/model/ttypes.py | 1 +
.../client/samples/CreateLaunchBES.java | 3 +-
.../client/samples/CreateLaunchExperiment.java | 1 +
.../client/samples/RegisterSampleData.java | 4 +-
.../tools/RegisterOGCEUS3Application.java | 7 +-
.../tools/RegisterSampleApplications.java | 6 +-
.../tools/RegisterSampleApplicationsUtils.java | 2 +
.../client/tools/RegisterUS3Application.java | 7 +-
.../org/apache/airavata/model/Workflow.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 24 +-
.../ComputeResourceDescription.java | 240 +-
.../computeresource/DataMovementInterface.java | 630 -
.../computeresource/DataMovementProtocol.java | 87 -
.../computeresource/GlobusJobSubmission.java | 56 +-
.../computeresource/GridFTPDataMovement.java | 681 -
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALDataMovement.java | 418 -
.../computeresource/LOCALSubmission.java | 24 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SCPDataMovement.java | 746 -
.../computeresource/SSHJobSubmission.java | 56 +-
.../computeresource/SecurityProtocol.java | 88 -
.../computeresource/UnicoreDataMovement.java | 629 -
.../computeresource/UnicoreJobSubmission.java | 24 +-
.../ComputeResourcePreference.java | 22 +-
.../gatewayprofile/DataStoragePreference.java | 728 -
.../gatewayprofile/GatewayResourceProfile.java | 154 +-
.../gatewayprofile/StoragePreference.java | 728 +
.../StorageResourceDescription.java | 900 +
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../airavata/model/data/movement/DMType.java | 62 +
.../data/movement/DataMovementInterface.java | 630 +
.../data/movement/DataMovementProtocol.java | 87 +
.../data/movement/GridFTPDataMovement.java | 681 +
.../model/data/movement/LOCALDataMovement.java | 418 +
.../model/data/movement/SCPDataMovement.java | 746 +
.../model/data/movement/SecurityProtocol.java | 88 +
.../data/movement/UnicoreDataMovement.java | 629 +
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 256 +-
.../model/experiment/ExperimentStatistics.java | 218 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 116 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 116 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 24 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 170 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../core/config/DataTransferTaskConfig.java | 2 +-
.../gfac/core/config/GFacYamlConfigruation.java | 2 +-
.../gfac/core/context/ProcessContext.java | 22 +-
.../org/apache/airavata/gfac/impl/Factory.java | 1 +
.../airavata/gfac/impl/GFacEngineImpl.java | 2 +
.../integration/tools/DocumentCreatorNew.java | 3 -
.../integration/tools/DocumentCreatorUtils.java | 2 -
.../core/utils/OrchestratorUtils.java | 14 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 1 +
.../core/app/catalog/impl/AppCatalogImpl.java | 4 +
.../app/catalog/impl/ComputeResourceImpl.java | 29 +-
.../catalog/impl/GwyResourceProfileImpl.java | 44 +-
.../app/catalog/impl/StorageResourceImpl.java | 248 +
.../catalog/model/DataStoragePreference.java | 96 -
.../catalog/model/DataStoragePreferencePK.java | 64 -
.../app/catalog/model/DataStorageResource.java | 113 +
.../app/catalog/model/StorageInterface.java | 102 +
.../app/catalog/model/StorageInterface_PK.java | 62 +
.../app/catalog/model/StoragePreference.java | 95 +
.../app/catalog/model/StoragePreferencePK.java | 64 +
.../core/app/catalog/model/StorageResource.java | 110 +
.../resources/AppCatAbstractResource.java | 29 +-
.../DataStoragePreferenceResource.java | 323 -
.../resources/StorageInterfaceResource.java | 326 +
.../resources/StoragePreferenceResource.java | 322 +
.../resources/StorageResourceResource.java | 350 +
.../app/catalog/util/AppCatalogJPAUtils.java | 48 +-
.../catalog/util/AppCatalogResourceType.java | 4 +-
.../util/AppCatalogThriftConversion.java | 55 +-
.../catalog/model/UserConfigurationData.java | 10 +
.../UserConfigurationDataResource.java | 9 +
.../src/main/resources/META-INF/persistence.xml | 4 +-
.../src/main/resources/appcatalog-derby.sql | 28 +-
.../src/main/resources/appcatalog-mysql.sql | 27 +-
...puteAppCatalogExperimentCatResourceTest.java | 1 +
.../app/catalog/GatewayProfileTest.java | 2 +-
.../airavata/registry/cpi/AppCatalog.java | 6 +
.../airavata/registry/cpi/ComputeResource.java | 5 +-
.../registry/cpi/GwyResourceProfile.java | 6 +-
.../airavata/registry/cpi/StorageResource.java | 90 +
.../ComputeResourceRegister.java | 6 +-
.../airavata-api/airavata_api.thrift | 209 +-
.../airavata-api/airavata_data_models.thrift | 1 +
.../airavata-api/compute_resource_model.thrift | 131 +-
.../airavata-api/data_movement_models.thrift | 154 +
.../airavata-api/experiment_model.thrift | 7 +-
.../gateway_resource_profile_model.thrift | 9 +-
.../airavata-api/process_model.thrift | 3 +-
.../airavata-api/storage_resource_model.thrift | 4 +-
.../airavata-api/task_model.thrift | 7 +-
.../generate-thrift-stubs.sh | 2 +
194 files changed, 46892 insertions(+), 24226 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9e4dccff/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
----------------------------------------------------------------------