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/06/16 09:09:42 UTC
[incubator-datalab] branch develop updated: [DATALAB-2413] --
changed quartz_mongodb dependencies
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 29729c4 [DATALAB-2413] -- changed quartz_mongodb dependencies
new 1bf1940 Merge branch 'develop' of https://github.com/apache/incubator-datalab into develop
29729c4 is described below
commit 29729c49fa7642fbf235deaecbca542ca3a6aef2
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Wed Jun 16 12:08:18 2021 +0300
[DATALAB-2413] -- changed quartz_mongodb dependencies
---
.../main/java/com/epam/datalab/dto/UserInstanceDTO.java | 15 +--------------
.../com/epam/datalab/model/exploratory/Exploratory.java | 2 --
services/self-service/pom.xml | 5 +++--
.../datalab/backendapi/resources/ExploratoryResource.java | 2 --
.../resources/dto/ExploratoryCreateFormDTO.java | 4 ----
.../backendapi/service/impl/ExploratoryServiceImpl.java | 4 +---
.../self-service/src/main/resources/quartz.properties | 3 ++-
7 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/UserInstanceDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/UserInstanceDTO.java
index 2560bc6..ee4d85a 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/UserInstanceDTO.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/UserInstanceDTO.java
@@ -88,10 +88,7 @@ public class UserInstanceDTO {
private String gpuType;
@JsonProperty("gpu_count")
private String gpuCount;
- @JsonProperty("slave_gpu_type")
- private String slaveGpuType;
- @JsonProperty("slave_gpu_count")
- private String slaveGpuCount;
+
/**
* Sets the user login name.
@@ -212,14 +209,4 @@ public class UserInstanceDTO {
setGpuCount(gpuCount);
return this;
}
-
- public UserInstanceDTO withSlaveGPUType(String slaveGpuType) {
- setSlaveGpuType(slaveGpuType);
- return this;
- }
-
- public UserInstanceDTO withSlaveGPUCount(String slaveGpuType) {
- setSlaveGpuCount(slaveGpuType);
- return this;
- }
}
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java b/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
index 414ea86..1414dd4 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
@@ -41,6 +41,4 @@ public class Exploratory {
private Boolean enabledGPU;
private String gpuType;
private String gpuCount;
- private String slaveGpuType;
- private String slaveGpuCount;
}
diff --git a/services/self-service/pom.xml b/services/self-service/pom.xml
index a0027e8..d16f920 100644
--- a/services/self-service/pom.xml
+++ b/services/self-service/pom.xml
@@ -53,8 +53,9 @@
<dependency>
<groupId>com.novemberain</groupId>
<artifactId>quartz-mongodb</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-rc2</version>
</dependency>
+
<dependency>
<groupId>com.epam.datalab</groupId>
<artifactId>common</artifactId>
@@ -282,7 +283,7 @@
<resourcePackages>
<package>com.epam.datalab.backendapi.resources</package>
</resourcePackages>
- <prettyPrint>TRUE</prettyPrint>
+ <prettyPrint>true</prettyPrint>
</configuration>
<executions>
<execution>
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
index 33d0d0d..43dbc9c 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
@@ -165,8 +165,6 @@ public class ExploratoryResource implements ExploratoryAPI {
.exploratoryTag(formDTO.getExploratoryTag())
.gpuType(formDTO.getGpuType())
.gpuCount(formDTO.getGpuCount())
- .slaveGpuCount(formDTO.getSlaveGpuCount())
- .slaveGpuType(formDTO.getSlaveGpuType())
.enabledGPU(formDTO.getEnabledGPU())
.build();
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
index ba0a804..8794bee 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
@@ -65,10 +65,6 @@ public class ExploratoryCreateFormDTO {
private String gpuType;
@JsonProperty("gpu_count")
private String gpuCount;
- @JsonProperty("slave_gpu_type")
- private String slaveGpuType;
- @JsonProperty("slave_gpu_count")
- private String slaveGpuCount;
@Override
public String toString() {
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
index bfa7b2f..ade4807 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
@@ -407,9 +407,7 @@ public class ExploratoryServiceImpl implements ExploratoryService {
exploratory.getExploratoryTag(), exploratory.getEnabledGPU()))
.withGPUCount(exploratory.getGpuCount())
.withGPUEnabled(exploratory.getEnabledGPU())
- .withGPUType(exploratory.getGpuType())
- .withSlaveGPUCount(exploratory.getSlaveGpuCount())
- .withSlaveGPUType(exploratory.getSlaveGpuType());
+ .withGPUType(exploratory.getGpuType());
if (StringUtils.isNotBlank(exploratory.getImageName())) {
final List<LibInstallDTO> libInstallDtoList = getImageRelatedLibraries(userInfo, exploratory.getImageName(),
project, exploratory.getEndpoint());
diff --git a/services/self-service/src/main/resources/quartz.properties b/services/self-service/src/main/resources/quartz.properties
index fdf33c6..7c2f67a 100644
--- a/services/self-service/src/main/resources/quartz.properties
+++ b/services/self-service/src/main/resources/quartz.properties
@@ -16,7 +16,8 @@
# specific language governing permissions and limitations
# under the License.
#
-org.quartz.jobStore.class=com.novemberain.quartz.mongodb.MongoDBJobStore
+#org.quartz.jobStore.class=com.novemberain.quartz.mongodb.MongoDBJobStore
+org.quartz.jobStore.class=com.novemberain.quartz.mongodb.DynamicMongoDBJobStore
org.quartz.jobStore.collectionPrefix=scheduler
org.quartz.jobStore.isClustered=true
org.quartz.scheduler.instanceId=AUTO
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org