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/07/07 12:37:54 UTC
[incubator-datalab] 01/03: [DATALAB] -- added test logs
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATATALAB-2504
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 0ececb2d8dfaa4ad6a73cf5bd2c1ce24330f6437
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Wed Jul 7 12:25:16 2021 +0300
[DATALAB] -- added test logs
---
.../core/response/handlers/ComputationalCallbackHandler.java | 4 ++++
.../backendapi/resources/aws/ComputationalResourceAws.java | 3 ++-
.../backendapi/resources/callback/ComputationalCallback.java | 11 +++++++++--
.../backendapi/service/impl/ComputationalServiceImpl.java | 4 ++++
.../service/impl/InfrastructureInfoServiceImpl.java | 5 +++++
.../java/com/epam/datalab/backendapi/util/RequestBuilder.java | 6 ++++++
6 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ComputationalCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ComputationalCallbackHandler.java
index 7e0a549..99b5f0e 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ComputationalCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ComputationalCallbackHandler.java
@@ -75,11 +75,15 @@ public class ComputationalCallbackHandler extends ResourceCallbackHandler<Comput
@Override
protected ComputationalStatusDTO parseOutResponse(JsonNode resultNode, ComputationalStatusDTO baseStatus) {
+ log.info("TEST LOG!!!: parseOutResponse :\n resultNode: {}", resultNode);
+
if (resultNode == null) {
return baseStatus;
}
baseStatus.withComputationalUrl(extractUrl(resultNode));
baseStatus.withLastActivity(Date.from(Instant.now()));
+ log.info("TEST LOG!!!: base status: {}", baseStatus);
+ log.info("TEST LOG!!!: getAction: {}", getAction());
if (DockerAction.CREATE == getAction()) {
baseStatus
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/aws/ComputationalResourceAws.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/aws/ComputationalResourceAws.java
index 1818b29..9af68b3 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/aws/ComputationalResourceAws.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/aws/ComputationalResourceAws.java
@@ -68,7 +68,8 @@ public class ComputationalResourceAws extends DockerService implements DockerCom
@POST
@Path(ComputationalAPI.COMPUTATIONAL_CREATE_CLOUD_SPECIFIC)
public String create(@Auth UserInfo ui, ComputationalCreateAws dto) {
- log.debug("Create computational resources {} for user {}: {}", dto.getComputationalName(), ui.getName(), dto);
+
+ log.info("Create computational resources {} for user {}: {}", dto.getComputationalName(), ui.getName(), dto);
String uuid = DockerCommands.generateUUID();
folderListenerExecutor.start(configuration.getImagesDirectory(),
configuration.getResourceStatusPollTimeout(),
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ComputationalCallback.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ComputationalCallback.java
index 5e074ae..cb7e1a7 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ComputationalCallback.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ComputationalCallback.java
@@ -66,6 +66,8 @@ public class ComputationalCallback {
@POST
@Path(ApiCallbacks.STATUS_URI)
public Response status(ComputationalStatusDTO dto) {
+ log.info("TEST LOG!!!: status: {}", dto);
+
log.debug("Updating status for computational resource {} for user {}: {}",
dto.getComputationalName(), dto.getUser(), dto);
String uuid = dto.getRequestId();
@@ -77,11 +79,16 @@ public class ComputationalCallback {
new DatalabException(String.format("Computational resource %s of exploratory environment %s of " +
"project %s for user %s doesn't exist", dto.getComputationalName(),
dto.getExploratoryName(), dto.getProject(), dto.getUser())));
- log.debug("Current status for computational resource {} of exploratory environment {} for user {} is {}",
+
+ log.info("TEST LOG!!!: compResource: {}", compResource);
+
+ log.info("Current status for computational resource {} of exploratory environment {} for user {} is {}",
dto.getComputationalName(), dto.getExploratoryName(), dto.getUser(),
compResource.getStatus());
try {
- computationalDAO.updateComputationalFields(dto.withLastActivity(new Date()));
+ computationalDAO.updateComputationalFields(dto
+ .withLastActivity(new Date()));
+// .withStatus(UserInstanceStatus.RUNNING));
} catch (DatalabException e) {
log.error("Could not update status for computational resource {} for user {} to {}: {}", dto, e);
throw e;
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImpl.java
index d93298b..2da87a3 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImpl.java
@@ -205,9 +205,13 @@ public class ComputationalServiceImpl implements ComputationalService {
boolean isAdded = computationalDAO.addComputational(userInfo.getName(), formDTO.getNotebookName(), project,
computationalResource);
+ log.info("TEST LOG!!!: isAdded: {}", isAdded);
+
if (isAdded) {
try {
EndpointDTO endpointDTO = endpointService.get(instance.getEndpoint());
+ log.info("TEST LOG!!!: send to prov");
+
String uuid =
provisioningService.post(endpointDTO.getUrl() + COMPUTATIONAL_CREATE_CLOUD_SPECIFIC,
userInfo.getAccessToken(),
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
index fe2f340..09d05b9 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
@@ -130,6 +130,11 @@ public class InfrastructureInfoServiceImpl implements InfrastructureInfoService
@Override
public InfrastructureMetaInfoDTO getInfrastructureMetaInfo() {
final String branch = Manifests.read("GIT-Branch");
+ log.info("TEST LOG!!!: Mainfests: {}, branch: {}", Manifests.DEFAULT, branch);
+ log.info("TEST LOG!!!: Git-Commit: {} ", Manifests.read("GIT-Commit"));
+ log.info("TEST LOG!!!: Datalab-Version: {}", Manifests.read("DataLab-Version"));
+ log.info("TEST LOG!!!: RELEASE_NOTES_FORMAT: {}", RELEASE_NOTES_FORMAT);
+
return InfrastructureMetaInfoDTO.builder()
.branch(branch)
.commit(Manifests.read("GIT-Commit"))
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
index 7362160..0dc1a2a 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
@@ -65,6 +65,7 @@ import com.epam.datalab.model.exploratory.Exploratory;
import com.epam.datalab.util.UsernameUtils;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import lombok.extern.slf4j.Slf4j;
import java.util.List;
import java.util.Map;
@@ -73,6 +74,7 @@ import java.util.UUID;
import static com.epam.datalab.cloud.CloudProvider.*;
@Singleton
+@Slf4j
public class RequestBuilder {
private static final String UNSUPPORTED_CLOUD_PROVIDER_MESSAGE = "Unsupported cloud provider ";
private static final String AZURE_REFRESH_TOKEN_KEY = "refresh_token";
@@ -335,6 +337,8 @@ public class RequestBuilder {
UserInstanceDTO userInstance,
ComputationalCreateFormDTO form,
EndpointDTO endpointDTO) {
+ log.info("TEST LOG!!!: newComputationalCreate: \n form: {}", form);
+
T computationalCreate;
CloudProvider cloudProvider = endpointDTO.getCloudProvider();
switch (cloudProvider) {
@@ -351,6 +355,8 @@ public class RequestBuilder {
.withVersion(awsForm.getVersion())
.withConfig((awsForm.getConfig()))
.withSharedImageEnabled(String.valueOf(projectDTO.isSharedImageEnabled()));
+ log.info("TEST LOG!!!: computationalCreate: {}", computationalCreate);
+
break;
case GCP:
GcpComputationalCreateForm gcpForm = (GcpComputationalCreateForm) form;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org