You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2021/04/28 15:35:34 UTC
[incubator-datalab] branch DATALAB-2091 updated: [DATALAB-2352] -
fixed BUG
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2091 by this push:
new db908c3 [DATALAB-2352] - fixed BUG
new d1d8d53 Merge remote-tracking branch 'origin/DATALAB-2091' into DATALAB-2091
db908c3 is described below
commit db908c354cf995d6f58513975f1fc1f1bc091ee1
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Wed Apr 28 18:34:47 2021 +0300
[DATALAB-2352] - fixed BUG
---
.../com/epam/datalab/dto/imagemetadata/EdgeGPU.java | 3 ++-
.../impl/InfrastructureTemplateServiceImpl.java | 19 ++++++++++++-------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/EdgeGPU.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/EdgeGPU.java
index 24ddfcd..8a4c0d8 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/EdgeGPU.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/EdgeGPU.java
@@ -25,6 +25,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import java.util.ArrayList;
import java.util.List;
@Data
@@ -34,5 +35,5 @@ import java.util.List;
public class EdgeGPU {
private String projectName;
- private List<GPU> gpus;
+ private List<GPU> gpus = new ArrayList<>();
}
\ No newline at end of file
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
index 55cccfc..29e66a6 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
@@ -65,9 +65,6 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
private final UserGroupDAO userGroupDao;
private final GpuDAO gpuDAO;
private final EndpointService endpointService;
-
-
- @Inject
private final RESTService provisioningService;
@Inject
@@ -88,13 +85,20 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
log.debug("Loading list of exploratory templates for user {} for project {}", user.getName(), project);
try {
+
+
EndpointDTO endpointDTO = endpointService.get(endpoint);
+ log.info("TEST LOG!!! endpoint: {}", endpointDTO);
+ log.info("TEST LOG!!! prov: {}", provisioningService);
+
ExploratoryMetadataDTO[] array =
provisioningService.get(endpointDTO.getUrl() + DOCKER_EXPLORATORY,
user.getAccessToken(),
ExploratoryMetadataDTO[].class);
final Set<String> roles = userGroupDao.getUserGroups(user.getName());
+ log.info("TEST LOG!!! roles: {}", roles);
+
return Arrays.stream(array)
.peek(e -> e.setImage(getSimpleImageName(e.getImage())))
.filter(e -> exploratoryGpuIssuesAzureFilter(e, endpointDTO.getCloudProvider()) &&
@@ -222,7 +226,7 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
}
}
- private class AwsFullComputationalTemplate extends FullComputationalTemplate {
+ private static class AwsFullComputationalTemplate extends FullComputationalTemplate {
@JsonProperty("limits")
private AwsEmrConfiguration awsEmrConfiguration;
@@ -233,7 +237,7 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
}
}
- private class GcpFullComputationalTemplate extends FullComputationalTemplate {
+ private static class GcpFullComputationalTemplate extends FullComputationalTemplate {
@JsonProperty("limits")
private GcpDataprocConfiguration gcpDataprocConfiguration;
@@ -244,7 +248,7 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
}
}
- private class SparkFullComputationalTemplate extends FullComputationalTemplate {
+ private static class SparkFullComputationalTemplate extends FullComputationalTemplate {
@JsonProperty("limits")
private SparkStandaloneConfiguration sparkStandaloneConfiguration;
@@ -256,8 +260,9 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
}
private void addGpu(ExploratoryMetadataDTO e, String projectName) {
+ log.info("Trying to read GPU from DB for {}", projectName);
try {
- gpuDAO.getGPUByProjectName(projectName).ifPresent(x -> e.setComputationGPU(x.getGpus()));
+ gpuDAO.getGPUByProjectName(projectName).ifPresent(edgeGPU -> e.setComputationGPU(edgeGPU.getGpus()));
} catch (Exception ex) {
log.info(ex.getMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org