You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/08/03 20:07:43 UTC
[airavata] branch develop updated (558069b -> c378737)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 558069b AIRAVATA-2586 Move dev django portals to /data/portals
new 825218d AIRAVATA-2806 Removing duplicate methods
new c378737 AIRAVATA-2806 ComputeResourcePreference default values
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/airavata/gfac/core/GFacUtils.java | 2 +-
.../airavata/gfac/core/context/ProcessContext.java | 56 +++++-----------------
2 files changed, 12 insertions(+), 46 deletions(-)
[airavata] 01/02: AIRAVATA-2806 Removing duplicate methods
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 825218d752e85b9b9d5756ab7da632a4f9abefce
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Aug 3 16:04:31 2018 -0400
AIRAVATA-2806 Removing duplicate methods
---
.../java/org/apache/airavata/gfac/core/GFacUtils.java | 2 +-
.../airavata/gfac/core/context/ProcessContext.java | 18 ------------------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 826f226..a86cbbd 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -802,7 +802,7 @@ public class GFacUtils {
public static JobSubmissionInterface getPreferredJobSubmissionInterface(ProcessContext processContext, RegistryService.Client registryClient) throws TException, ApplicationSettingsException {
try {
String resourceHostId = processContext.getComputeResourceDescription().getComputeResourceId();
- JobSubmissionProtocol preferredJobSubmissionProtocol = processContext.getPreferredJobSubmissionProtocol();
+ JobSubmissionProtocol preferredJobSubmissionProtocol = processContext.getJobSubmissionProtocol();
ComputeResourceDescription resourceDescription = registryClient.getComputeResource(resourceHostId);
List<JobSubmissionInterface> jobSubmissionInterfaces = resourceDescription.getJobSubmissionInterfaces();
Map<JobSubmissionProtocol, List<JobSubmissionInterface>> orderedInterfaces = new HashMap<>();
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index 83e5ec0..552028e 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -486,24 +486,6 @@ public class ProcessContext {
}
}
- public JobSubmissionProtocol getPreferredJobSubmissionProtocol(){
- if (isSetGroupResourceProfile() &&
- groupComputeResourcePreference != null &&
- groupComputeResourcePreference.getPreferredJobSubmissionProtocol() != null) {
- return groupComputeResourcePreference.getPreferredJobSubmissionProtocol();
- }
- return gatewayComputeResourcePreference.getPreferredJobSubmissionProtocol();
- }
-
- public DataMovementProtocol getPreferredDataMovementProtocol() {
- if (isSetGroupResourceProfile() &&
- groupComputeResourcePreference != null &&
- groupComputeResourcePreference.getPreferredDataMovementProtocol() != null) {
- return groupComputeResourcePreference.getPreferredDataMovementProtocol();
- }
- return gatewayComputeResourcePreference.getPreferredDataMovementProtocol();
- }
-
public void setMonitorMode(MonitorMode monitorMode) {
this.monitorMode = monitorMode;
}
[airavata] 02/02: AIRAVATA-2806 ComputeResourcePreference default
values
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit c378737e28b982700fabdc6cc49f3f3eeac26e9e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Aug 3 16:05:08 2018 -0400
AIRAVATA-2806 ComputeResourcePreference default values
Fixing up which fields are used from ComputeResourcePreferences for
defualt values.
---
.../airavata/gfac/core/context/ProcessContext.java | 38 +++++++---------------
1 file changed, 11 insertions(+), 27 deletions(-)
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index 552028e..b6e9c62 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -448,12 +448,8 @@ public class ProcessContext {
userComputeResourcePreference != null &&
isValid(userComputeResourcePreference.getComputeResourceId())) {
return userComputeResourcePreference.getComputeResourceId();
- } else if (isSetGroupResourceProfile() &&
- groupComputeResourcePreference != null &&
- isValid(groupComputeResourcePreference.getComputeResourceId())){
- return groupComputeResourcePreference.getComputeResourceId();
} else {
- return gatewayComputeResourcePreference.getComputeResourceId();
+ return groupComputeResourcePreference.getComputeResourceId();
}
}
@@ -470,11 +466,8 @@ public class ProcessContext {
isValid(groupComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
return groupComputeResourcePreference.getResourceSpecificCredentialStoreToken();
} else {
- if (isValid(gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
- return gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken();
- } else {
- return gatewayResourceProfile.getCredentialStoreToken();
- }
+ // FIXME: fallback to credential store token on GroupResourceProfile (see AIRAVATA-2865)
+ return gatewayResourceProfile.getCredentialStoreToken();
}
}
@@ -691,11 +684,12 @@ getComputeResourceCredentialToken());
}
public String getUsageReportingGatewayId() {
- if (isSetGroupResourceProfile() &&
- groupComputeResourcePreference != null &&
- isValid(groupComputeResourcePreference.getUsageReportingGatewayId())) {
- return groupComputeResourcePreference.getUsageReportingGatewayId();
- }
+ // FIXME: Should GroupResourceProfiles be able to specify a different usage reporting gateway id?
+// if (isSetGroupResourceProfile() &&
+// groupComputeResourcePreference != null &&
+// isValid(groupComputeResourcePreference.getUsageReportingGatewayId())) {
+// return groupComputeResourcePreference.getUsageReportingGatewayId();
+// }
return gatewayComputeResourcePreference.getUsageReportingGatewayId();
}
@@ -722,16 +716,10 @@ getComputeResourceCredentialToken());
reservation = userComputeResourcePreference.getReservation();
start = userComputeResourcePreference.getReservationStartTime();
end = userComputeResourcePreference.getReservationEndTime();
- } else if (isSetGroupResourceProfile() &&
- groupComputeResourcePreference != null &&
- isValid(groupComputeResourcePreference.getReservation())){
+ } else {
reservation = groupComputeResourcePreference.getReservation();
start = groupComputeResourcePreference.getReservationStartTime();
end = groupComputeResourcePreference.getReservationEndTime();
- } else {
- reservation = gatewayComputeResourcePreference.getReservation();
- start = gatewayComputeResourcePreference.getReservationStartTime();
- end = gatewayComputeResourcePreference.getReservationEndTime();
}
if (reservation != null && start > 0 && start < end) {
long now = Calendar.getInstance().getTimeInMillis();
@@ -747,12 +735,8 @@ getComputeResourceCredentialToken());
userComputeResourcePreference != null &&
userComputeResourcePreference.getQualityOfService() != null) {
return userComputeResourcePreference.getQualityOfService();
- } else if (isSetGroupResourceProfile() &&
- groupComputeResourcePreference != null &&
- isValid(groupComputeResourcePreference.getQualityOfService())){
+ } else {
return groupComputeResourcePreference.getQualityOfService();
- } else {
- return gatewayComputeResourcePreference.getQualityOfService();
}
}