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/05 11:12:52 UTC
[incubator-datalab] branch develop updated: [DATALAB] -- fixed
version of mongo-quartz
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new dd30eea [DATALAB] -- fixed version of mongo-quartz
dd30eea is described below
commit dd30eea5153719e579fd3567b08ba2be002af6cb
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Mon Jul 5 14:11:34 2021 +0300
[DATALAB] -- fixed version of mongo-quartz
---
.../backendapi/core/response/handlers/EdgeCallbackHandler.java | 5 ++++-
services/self-service/pom.xml | 8 +++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
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 4c20794..af218c1 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
@@ -29,9 +29,11 @@ import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
+@Slf4j
public class EdgeCallbackHandler<E extends EdgeInfo, T extends UploadFileResult<E>> extends ResourceCallbackHandler<T> {
@JsonProperty
private final String callbackURI;
@@ -57,7 +59,8 @@ public class EdgeCallbackHandler<E extends EdgeInfo, T extends UploadFileResult<
}
protected T parseOutResponse(JsonNode resultNode, T baseStatus) {
- if (resultNode != null && getAction() == DockerAction.CREATE
+ log.info("TEST LOG!!!: edge callback: resultNode: {}, baseStatus: {}", resultNode, baseStatus);
+ if (resultNode != null && (getAction() == DockerAction.CREATE || getAction() == DockerAction.START)
&& UserInstanceStatus.of(baseStatus.getStatus()) != UserInstanceStatus.FAILED) {
try {
E credential = mapper.readValue(resultNode.toString(), responseType);
diff --git a/services/self-service/pom.xml b/services/self-service/pom.xml
index 5ed21ef..33a9cc2 100644
--- a/services/self-service/pom.xml
+++ b/services/self-service/pom.xml
@@ -53,7 +53,13 @@
<dependency>
<groupId>com.github.michaelklishin</groupId>
<artifactId>quartz-mongodb</artifactId>
- <version>2.1.0</version>
+ <version>v2.2.0-rc1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org