This is an automated email from the ASF dual-hosted git repository. ykinash pushed a commit to branch DATALAB-2363 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 95c9d19633418ed37984647d0fc458cae2ca29d5 Author: KinashYurii <[email protected]> AuthorDate: Thu May 20 14:27:03 2021 +0300 [DATALAB-2401] - added test logs for --- .../datalab/backendapi/core/DockerWarmuper.java | 27 ++++++++++++++-------- .../backendapi/resources/DockerResource.java | 1 + .../impl/InfrastructureTemplateServiceImpl.java | 18 +++++++++------ 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/DockerWarmuper.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/DockerWarmuper.java index 14c4f44..1d295c2 100644 --- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/DockerWarmuper.java +++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/DockerWarmuper.java @@ -35,20 +35,19 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import com.google.inject.Singleton; import io.dropwizard.lifecycle.Managed; +import lombok.ToString; +import lombok.extern.log4j.Log4j; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @Singleton +@Slf4j public class DockerWarmuper implements Managed, DockerCommands, MetadataHolder { private static final Logger LOGGER = LoggerFactory.getLogger(DockerWarmuper.class); public static final String EXPLORATORY_RESPONSE_MARKER = "exploratory_environment_shapes"; @@ -59,8 +58,8 @@ public class DockerWarmuper implements Managed, DockerCommands, MetadataHolder { private FolderListenerExecutor folderListenerExecutor; @Inject private ICommandExecutor commandExecutor; - private Map<String, String> imageList = new ConcurrentHashMap<>(); - private Set<ImageMetadataDTO> metadataDTOs = ConcurrentHashMap.newKeySet(); + private final Map<String, String> imageList = new ConcurrentHashMap<>(); + private final Set<ImageMetadataDTO> metadataDTOs = ConcurrentHashMap.newKeySet(); @Override @@ -165,8 +164,18 @@ public class DockerWarmuper implements Managed, DockerCommands, MetadataHolder { } public Set<ImageMetadataDTO> getMetadata(ImageType type) { - return metadataDTOs.stream() + Set<ImageMetadataDTO> collect = metadataDTOs.stream() .filter(m -> m.getImageType().equals(type)) .collect(Collectors.toSet()); + log.info("TEST: type: {}, set: {}", type, collect); + return collect; + } + + @Override + public String toString() { + return "DockerWarmuper{" + + ", imageList=" + imageList + + ", metadataDTOs=" + metadataDTOs + + '}'; } } diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/DockerResource.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/DockerResource.java index 587bed6..4301cd0 100644 --- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/DockerResource.java +++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/DockerResource.java @@ -62,6 +62,7 @@ public class DockerResource implements DockerCommands { @Path("{type}") public Set<ImageMetadataDTO> getDockerImages(@Auth UserInfo ui, @PathParam("type") String type) { LOGGER.debug("docker statuses asked for {}", type); + LOGGER.info("meta {}", metadataHolder); return metadataHolder .getMetadata(ImageType.valueOf(type.toUpperCase())); } 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 204c13a..e0ee035 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 @@ -85,27 +85,27 @@ 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); + log.info("TEST LOG!!! endpoint: {}", endpointDTO.toString()); ExploratoryMetadataDTO[] array = provisioningService.get(endpointDTO.getUrl() + DOCKER_EXPLORATORY, user.getAccessToken(), ExploratoryMetadataDTO[].class); + log.info("loaded: {}", (Object) array); final Set<String> roles = userGroupDao.getUserGroups(user.getName()); log.info("TEST LOG!!! roles: {}", roles); - - return Arrays.stream(array) + List<ExploratoryMetadataDTO> s= Arrays.stream(array) .peek(e -> e.setImage(getSimpleImageName(e.getImage()))) .filter(e -> exploratoryGpuIssuesAzureFilter(e, endpointDTO.getCloudProvider()) && UserRoles.checkAccess(user, RoleType.EXPLORATORY, e.getImage(), roles)) .peek(e -> filterShapes(user, e.getExploratoryEnvironmentShapes(), RoleType.EXPLORATORY_SHAPES, roles)) .peek(e -> addGpu(e, project)) .collect(Collectors.toList()); + log.info("loaded: {}", s); + + return s; } catch (DatalabException e) { log.error("Could not load list of exploratory templates for user: {}", user.getName(), e); @@ -123,15 +123,19 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate provisioningService.get(endpointDTO.getUrl() + DOCKER_COMPUTATIONAL, user.getAccessToken(), ComputationalMetadataDTO[] .class); + log.info("loaded: {}", (Object) array); final Set<String> roles = userGroupDao.getUserGroups(user.getName()); - return Arrays.stream(array) + List<FullComputationalTemplate> s = Arrays.stream(array) .peek(e -> e.setImage(getSimpleImageName(e.getImage()))) .peek(e -> filterShapes(user, e.getComputationResourceShapes(), RoleType.COMPUTATIONAL_SHAPES, roles)) .filter(e -> UserRoles.checkAccess(user, RoleType.COMPUTATIONAL, e.getImage(), roles)) .map(comp -> fullComputationalTemplate(comp, endpointDTO.getCloudProvider(), project)) .collect(Collectors.toList()); + log.info("changed: {}", s); + + return s; } catch (DatalabException e) { log.error("Could not load list of computational templates for user: {}", user.getName(), e); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
