You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/04/09 16:38:11 UTC
[airavata] branch develop updated: Using JobSubmission protocol as
Adaptor protocol
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 4cfca65 Using JobSubmission protocol as Adaptor protocol
4cfca65 is described below
commit 4cfca6546f4358739ceb3c9a345cf9ead2dd0233
Author: dimuthu <di...@gmail.com>
AuthorDate: Mon Apr 9 12:38:02 2018 -0400
Using JobSubmission protocol as Adaptor protocol
---
.../impl/task/cancel/RemoteJobCancellationTask.java | 2 +-
.../airavata/helix/impl/task/env/EnvSetupTask.java | 2 +-
.../helix/impl/task/staging/DataStagingTask.java | 2 +-
.../impl/task/submission/DefaultJobSubmissionTask.java | 2 +-
.../impl/task/submission/ForkJobSubmissionTask.java | 2 +-
.../airavata/helix/task/api/support/AdaptorSupport.java | 3 ++-
.../airavata/helix/core/support/AdaptorSupportImpl.java | 16 ++++++++++++----
7 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
index b402a7f..a4aa2ac 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
@@ -59,7 +59,7 @@ public class RemoteJobCancellationTask extends AiravataTask {
AgentAdaptor adaptor = taskHelper.getAdaptorSupport().fetchAdaptor(
getTaskContext().getGatewayId(),
getTaskContext().getComputeResourceId(),
- getTaskContext().getJobSubmissionProtocol().name(),
+ getTaskContext().getJobSubmissionProtocol(),
getTaskContext().getComputeResourceCredentialToken(),
getTaskContext().getComputeResourceLoginUserName());
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/env/EnvSetupTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/env/EnvSetupTask.java
index 9d1165c..cee024b 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/env/EnvSetupTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/env/EnvSetupTask.java
@@ -41,7 +41,7 @@ public class EnvSetupTask extends AiravataTask {
AgentAdaptor adaptor = taskHelper.getAdaptorSupport().fetchAdaptor(
getTaskContext().getGatewayId(),
getTaskContext().getComputeResourceId(),
- getTaskContext().getJobSubmissionProtocol().name(),
+ getTaskContext().getJobSubmissionProtocol(),
getTaskContext().getComputeResourceCredentialToken(),
getTaskContext().getComputeResourceLoginUserName());
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
index eaf9264..ef90647 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
@@ -90,7 +90,7 @@ public abstract class DataStagingTask extends AiravataTask {
return adaptorSupport.fetchAdaptor(
getTaskContext().getGatewayId(),
getTaskContext().getComputeResourceId(),
- getTaskContext().getJobSubmissionProtocol().name(),
+ getTaskContext().getJobSubmissionProtocol(),
getTaskContext().getComputeResourceCredentialToken(),
getTaskContext().getComputeResourceLoginUserName());
} catch (Exception e) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
index 62bb9b9..84b331b 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
@@ -66,7 +66,7 @@ public class DefaultJobSubmissionTask extends JobSubmissionTask {
AgentAdaptor adaptor = taskHelper.getAdaptorSupport().fetchAdaptor(
getTaskContext().getGatewayId(),
getTaskContext().getComputeResourceId(),
- getTaskContext().getJobSubmissionProtocol().name(),
+ getTaskContext().getJobSubmissionProtocol(),
getTaskContext().getComputeResourceCredentialToken(),
getTaskContext().getComputeResourceLoginUserName());
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/ForkJobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/ForkJobSubmissionTask.java
index 97dee2f..d74752f 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/ForkJobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/ForkJobSubmissionTask.java
@@ -58,7 +58,7 @@ public class ForkJobSubmissionTask extends JobSubmissionTask {
AgentAdaptor adaptor = taskHelper.getAdaptorSupport().fetchAdaptor(
getTaskContext().getGatewayId(),
getTaskContext().getComputeResourceId(),
- getTaskContext().getJobSubmissionProtocol().name(),
+ getTaskContext().getJobSubmissionProtocol(),
getTaskContext().getComputeResourceCredentialToken(),
getTaskContext().getComputeResourceLoginUserName());
diff --git a/modules/airavata-helix/task-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java b/modules/airavata-helix/task-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java
index f7e2bab..c8793b9 100644
--- a/modules/airavata-helix/task-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java
+++ b/modules/airavata-helix/task-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java
@@ -20,6 +20,7 @@
package org.apache.airavata.helix.task.api.support;
import org.apache.airavata.agents.api.*;
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import java.io.File;
@@ -32,7 +33,7 @@ import java.io.File;
public interface AdaptorSupport {
public void initializeAdaptor();
- public AgentAdaptor fetchAdaptor(String gatewayId, String computeResource, String protocol, String authToken, String userId) throws Exception;
+ public AgentAdaptor fetchAdaptor(String gatewayId, String computeResource, JobSubmissionProtocol protocol, String authToken, String userId) throws Exception;
public StorageResourceAdaptor fetchStorageAdaptor(String gatewayId, String storageResourceId, String protocol, String authToken, String userId) throws AgentException;
}
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/AdaptorSupportImpl.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/AdaptorSupportImpl.java
index 15d6324..f1bb854 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/AdaptorSupportImpl.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/AdaptorSupportImpl.java
@@ -23,6 +23,7 @@ import org.apache.airavata.agents.api.*;
import org.apache.airavata.helix.agent.ssh.SshAgentAdaptor;
import org.apache.airavata.helix.agent.storage.StorageResourceAdaptorImpl;
import org.apache.airavata.helix.task.api.support.AdaptorSupport;
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import java.io.File;
@@ -50,10 +51,17 @@ public class AdaptorSupportImpl implements AdaptorSupport {
public void initializeAdaptor() {
}
- public AgentAdaptor fetchAdaptor(String gatewayId, String computeResource, String protocol, String authToken, String userId) throws AgentException {
- SshAgentAdaptor agentAdaptor = new SshAgentAdaptor();
- agentAdaptor.init(computeResource, gatewayId, userId, authToken);
- return agentAdaptor;
+ public AgentAdaptor fetchAdaptor(String gatewayId, String computeResource, JobSubmissionProtocol protocol, String authToken, String userId) throws AgentException {
+
+ switch (protocol) {
+ case SSH:
+ SshAgentAdaptor agentAdaptor = new SshAgentAdaptor();
+ agentAdaptor.init(computeResource, gatewayId, userId, authToken);
+ return agentAdaptor;
+ default:
+ return null;
+ }
+
}
@Override
--
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.