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/08/16 10:16:47 UTC
[incubator-datalab] 01/01: [DATALAB-2531] -- fixed error with
statuses.
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2531
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit aa0d8bd7a8bcef2cd9d3e0df9dbb7c2c64742287
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Mon Aug 16 13:15:46 2021 +0300
[DATALAB-2531] -- fixed error with statuses.
---
.../java/com/epam/datalab/dto/base/edge/EdgeInfo.java | 4 ----
.../java/com/epam/datalab/dto/gcp/edge/EdgeInfoGcp.java | 2 --
.../core/response/handlers/EdgeCallbackHandler.java | 8 --------
.../core/response/handlers/ProjectCallbackHandler.java | 17 -----------------
.../core/response/handlers/ResourceCallbackHandler.java | 9 ---------
.../backendapi/resources/callback/ProjectCallback.java | 9 ---------
6 files changed, 49 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/base/edge/EdgeInfo.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/base/edge/EdgeInfo.java
index 290164c..46223a5 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/base/edge/EdgeInfo.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/base/edge/EdgeInfo.java
@@ -27,10 +27,6 @@ import java.util.List;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.WRAPPER_ARRAY)
-@JsonSubTypes({
- @JsonSubTypes.Type(value = EdgeInfoGcp.class, name = "gcp")
-})
public class EdgeInfo {
@JsonProperty("_id")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/edge/EdgeInfoGcp.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/edge/EdgeInfoGcp.java
index 851b1b9..490ce54 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/edge/EdgeInfoGcp.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/edge/EdgeInfoGcp.java
@@ -22,7 +22,6 @@ package com.epam.datalab.dto.gcp.edge;
import com.epam.datalab.dto.base.edge.EdgeInfo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@@ -33,7 +32,6 @@ import lombok.ToString;
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonTypeName("gcp")
public class EdgeInfoGcp extends EdgeInfo {
@JsonProperty("user_own_bucket_name")
private String userOwnBucketName;
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/EdgeCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/EdgeCallbackHandler.java
index 89395c9..8ebec10 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/EdgeCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/EdgeCallbackHandler.java
@@ -59,21 +59,13 @@ public class EdgeCallbackHandler<E extends EdgeInfo, T extends UploadFileResult<
}
protected T parseOutResponse(JsonNode resultNode, T baseStatus) {
- log.info("TEST LOG!!!: edge Call back Handler");
-
- log.info("TEST LOG!!!: resultNode: {}, baseStatus: {}", resultNode, baseStatus);
- log.info("TEST LOG!!!: getAction: {}, UserInstanceStatus.of(baseStatus.getStatus()): {}",
- getAction(), UserInstanceStatus.of(baseStatus.getStatus()));
if (resultNode != null
&& (getAction() == DockerAction.CREATE || getAction() == DockerAction.START)
&& UserInstanceStatus.of(baseStatus.getStatus()) != UserInstanceStatus.FAILED) {
try {
- log.info("TEST LOG!!!: TRY");
E credential = mapper.readValue(resultNode.toString(), responseType);
- log.info("TEST LOG!!!: credential: {}", credential);
credential.setEdgeStatus(UserInstanceStatus.RUNNING.toString());
baseStatus.withEdgeInfo(credential);
- log.info("TEST LOG!!!: baseStatus: {}", baseStatus);
} catch (IOException e) {
throw new DatalabException("Cannot parse the EDGE info in JSON: " + e.getLocalizedMessage(), e);
}
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ProjectCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ProjectCallbackHandler.java
index 6f82d46..1629c05 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ProjectCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ProjectCallbackHandler.java
@@ -48,7 +48,6 @@ public class ProjectCallbackHandler extends ResourceCallbackHandler<ProjectResul
this.projectName = projectName;
this.clazz = clazz;
this.endpointName = endpointName;
- log.info("TEST LOG!!!: CREATED ProjectCallbackHandler: clazz:{}, selfService:{}, action: {}", clazz, selfService, action);
}
@Override
@@ -58,34 +57,18 @@ public class ProjectCallbackHandler extends ResourceCallbackHandler<ProjectResul
@Override
protected ProjectResult parseOutResponse(JsonNode resultNode, ProjectResult baseStatus) {
-
- log.info("TEST LOG!!!: resultNode: {} , base status: {}", resultNode, baseStatus);
-
baseStatus.setProjectName(projectName);
baseStatus.setEndpointName(endpointName);
- log.info("TEST LOG!!!:base status: {},getAction() {}, UserInstanceStatus.of(baseStatus.getStatus()) {}",
- baseStatus.getStatus(), getAction(), UserInstanceStatus.of(baseStatus.getStatus()));
if (resultNode != null &&
Arrays.asList(DockerAction.CREATE, DockerAction.RECREATE, DockerAction.START).contains(getAction()) &&
UserInstanceStatus.of(baseStatus.getStatus()) != UserInstanceStatus.FAILED) {
try {
- log.info("TEST LOG!!!: if");
- log.info("TEST LOG!!!: clazz: {}, resultNode: {}", clazz, resultNode.toString());
-
- Object o = mapper.readValue(resultNode.toString(), Object.class);
- log.info("TEST LOG!!!: o:{}", o);
final EdgeInfo projectEdgeInfo = mapper.readValue(resultNode.toString(), clazz);
- log.info("TEST LOG!!!: projectEdgeInfo: {}", projectEdgeInfo);
-
baseStatus.setEdgeInfo(projectEdgeInfo);
- log.info("TEST LOG!!!: baseStatus: {}", baseStatus);
-
} catch (IOException e) {
throw new DatalabException("Cannot parse the EDGE info in JSON: " + e.getLocalizedMessage(), e);
}
}
- log.info("TEST LOG!!!: baseStatus: {}", baseStatus);
-
return baseStatus;
}
}
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ResourceCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ResourceCallbackHandler.java
index e566754..5a20b37 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ResourceCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ResourceCallbackHandler.java
@@ -114,21 +114,13 @@ public abstract class ResourceCallbackHandler<T extends StatusBaseDTO<?>> implem
@Override
public boolean handle(String fileName, byte[] content) throws Exception {
- log.info("TEST LOG!!!: class name: {}", this.getClass().getCanonicalName());
- log.info("TEST LOG!!!: URI: {}", this.getCallbackURI());
debugMessage("Got file {} while waiting for UUID {}, for action {}, docker response: {}",
fileName, uuid, action.name(), new String(content));
JsonNode document = mapper.readTree(content);
- log.info("TEST LOG!!!: document: {}", document);
boolean success = isSuccess(document);
UserInstanceStatus status = calcStatus(action, success);
T result = getBaseStatusDTO(status);
- log.info("TEST LOG!!!: result: {}", result);
-
-
JsonNode resultNode = document.get(RESPONSE_NODE).get(RESULT_NODE);
- log.info("TEST LOG!!!: resultNode: {}", resultNode);
-
if (success) {
debugMessage("Did {} resource for user: {}, UUID: {}", action, user, uuid);
} else {
@@ -136,7 +128,6 @@ public abstract class ResourceCallbackHandler<T extends StatusBaseDTO<?>> implem
result.setErrorMessage(getTextValue(resultNode.get(ERROR_NODE)));
}
result = parseOutResponse(resultNode, result);
- log.info("TEST LOG!!!: result: {}", result);
selfServicePost(result);
return !UserInstanceStatus.FAILED.equals(status);
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ProjectCallback.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ProjectCallback.java
index d9e5093..07a327f 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ProjectCallback.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ProjectCallback.java
@@ -64,7 +64,6 @@ public class ProjectCallback {
@POST
public Response updateProjectStatus(ProjectResult projectResult) {
- log.info("TEST LOG!!!: projectResult: {}", projectResult);
try {
requestId.checkAndRemove(projectResult.getRequestId());
final String projectName = projectResult.getProjectName();
@@ -72,19 +71,11 @@ public class ProjectCallback {
if (projectResult.getEdgeInfo() != null) {
saveGpuForProject(projectResult, projectName);
}
- log.info("TEST LOG!!!: projectResult: {}", projectResult);
if (UserInstanceStatus.RUNNING == status && Objects.nonNull(projectResult.getEdgeInfo())) {
- log.info("TEST LOG!!!: before RUNNING update: {}, {}, {}",
- projectName, projectResult.getEndpointName(), projectResult.getEdgeInfo());
projectDAO.updateEdgeInfo(projectName, projectResult.getEndpointName(), projectResult.getEdgeInfo());
} else {
- log.info("TEST LOG!!!: before updateExploratoriesStatusIfNeeded: {}, {}, {}",
- status, projectResult.getProjectName(), projectResult.getEndpointName());
updateExploratoriesStatusIfNeeded(status, projectResult.getProjectName(), projectResult.getEndpointName());
- log.info("TEST LOG!!!: before update: {}, {}, {}"
- , projectName, projectResult.getEndpointName(), status);
projectDAO.updateEdgeStatus(projectName, projectResult.getEndpointName(), status);
- log.info("TEST LOG!!!: after update");
}
} catch (Exception e) {
log.error(e.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org