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/10/07 01:26:13 UTC
[1/2] airavata git commit: fixed issue with rsync overs ssh
Repository: airavata
Updated Branches:
refs/heads/master ae208754b -> bd6571428
fixed issue with rsync overs ssh
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/625cbfd4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/625cbfd4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/625cbfd4
Branch: refs/heads/master
Commit: 625cbfd4b7aad54b007a471d8975be8ed845bf56
Parents: 808ff55
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Oct 6 19:16:10 2015 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Oct 6 19:16:10 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/impl/Factory.java | 5 +----
.../java/org/apache/airavata/gfac/impl/GFacEngineImpl.java | 8 ++++++--
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/625cbfd4/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
index e60e6eb..e2966c5 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
@@ -208,12 +208,9 @@ public abstract class Factory {
String key = processContext.getJobSubmissionProtocol().toString() + ":" + computeResourceId;
RemoteCluster remoteCluster = remoteClusterMap.get(key);
if (remoteCluster == null) {
- String hostName = Factory.getDefaultAppCatalog().getComputeResource().getComputeResource(computeResourceId).getHostName();
- ServerInfo serverInfo = new ServerInfo(processContext.getComputeResourcePreference().getLoginUserName(), hostName);
- processContext.setServerInfo(serverInfo);
JobManagerConfiguration jobManagerConfiguration = getJobManagerConfiguration(processContext.getResourceJobManager());
AuthenticationInfo authenticationInfo = getSSHKeyAuthentication();
- remoteCluster = new HPCRemoteCluster(serverInfo, jobManagerConfiguration, authenticationInfo);
+ remoteCluster = new HPCRemoteCluster(processContext.getServerInfo(), jobManagerConfiguration, authenticationInfo);
remoteClusterMap.put(key, remoteCluster);
}
return remoteCluster;
http://git-wip-us.apache.org/repos/asf/airavata/blob/625cbfd4/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 a7f6b32..b029180 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
@@ -110,6 +110,10 @@ public class GFacEngineImpl implements GFacEngine {
ApplicationInterfaceDescription applicationInterface = appCatalog.getApplicationInterface()
.getApplicationInterface(processModel.getApplicationInterfaceId());
processContext.setApplicationInterfaceDescription(applicationInterface);
+ String computeResourceId = processContext.getComputeResourceDescription().getComputeResourceId();
+ String hostName = Factory.getDefaultAppCatalog().getComputeResource().getComputeResource(computeResourceId).getHostName();
+ ServerInfo serverInfo = new ServerInfo(processContext.getComputeResourcePreference().getLoginUserName(), hostName);
+ processContext.setServerInfo(serverInfo);
List<OutputDataObjectType> applicationOutputs = applicationInterface.getApplicationOutputs();
if (applicationOutputs != null && !applicationOutputs.isEmpty()){
for (OutputDataObjectType outputDataObjectType : applicationOutputs){
@@ -579,8 +583,8 @@ public class GFacEngineImpl implements GFacEngine {
ServerInfo serverInfo = processContext.getServerInfo();
URI destination = null;
try {
- destination = new URI(processContext.getDataMovementProtocol().name(), serverInfo.getHost(),
- serverInfo.getUserName(), serverInfo.getPort(), processContext.getWorkingDir(), null, null);
+ destination = new URI(processContext.getDataMovementProtocol().name(), serverInfo.getUserName(),
+ serverInfo.getHost(), serverInfo.getPort(), processContext.getWorkingDir(), null, null);
} catch (URISyntaxException e) {
throw new TaskException("Error while constructing destination file URI");
}
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sh...@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/bd657142
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bd657142
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bd657142
Branch: refs/heads/master
Commit: bd6571428be75fd905ab30e294f418055ffd49af
Parents: 625cbfd ae20875
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Oct 6 19:17:04 2015 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Oct 6 19:17:04 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../src/main/resources/lib/airavata/Airavata.h | 56 ++++-----
.../lib/airavata/experiment_model_types.cpp | 8 +-
.../lib/airavata/experiment_model_types.h | 8 +-
.../lib/airavata/process_model_types.cpp | 4 +-
.../lib/airavata/process_model_types.h | 4 +-
.../lib/airavata/scheduling_model_types.cpp | 26 ++++-
.../lib/airavata/scheduling_model_types.h | 16 ++-
.../lib/Airavata/Model/Scheduling/Types.php | 23 ++++
.../apache/airavata/model/scheduling/ttypes.py | 15 ++-
.../client/samples/CreateLaunchExperiment.java | 36 +++---
.../org/apache/airavata/model/Workflow.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/DataMovementInterface.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/GridFTPDataMovement.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALDataMovement.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SCPDataMovement.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreDataMovement.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/DataStoragePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../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 +-
.../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 | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../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 | 2 +-
.../ComputationalResourceSchedulingModel.java | 116 ++++++++++++++++++-
.../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 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../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 +-
.../gfac/core/context/ProcessContext.java | 10 +-
.../catalog/model/ProcessResourceSchedule.java | 12 +-
.../catalog/model/UserConfigurationData.java | 12 +-
.../catalog/resources/ExperimentResource.java | 1 -
.../ProcessResourceScheduleResource.java | 10 ++
.../UserConfigurationDataResource.java | 10 ++
.../experiment/catalog/resources/Utils.java | 2 +
.../utils/ThriftDataModelConversion.java | 3 +
.../src/main/resources/expcatalog-derby.sql | 2 +
.../airavata-api/scheduling_model.thrift | 3 +-
91 files changed, 372 insertions(+), 145 deletions(-)
----------------------------------------------------------------------