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/24 08:18:36 UTC
[incubator-datalab] branch develop updated: [DATALAB] -- fixed bug
with wrong count param for Spark
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 bb9465a [DATALAB] -- fixed bug with wrong count param for Spark
new 35c9b4c Merge branch 'develop' of https://github.com/apache/incubator-datalab into develop
bb9465a is described below
commit bb9465a79333ae26e5b4d85a00acdf70de9b9231
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Thu Jun 24 11:17:58 2021 +0300
[DATALAB] -- fixed bug with wrong count param for Spark
---
.../dto/computational/SparkStandaloneClusterResource.java | 14 +++++---------
.../backendapi/service/impl/ComputationalServiceImpl.java | 4 ++--
.../service/impl/ComputationalServiceImplTest.java | 2 +-
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/SparkStandaloneClusterResource.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/SparkStandaloneClusterResource.java
index 3cd1981..3cd5804 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/SparkStandaloneClusterResource.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/SparkStandaloneClusterResource.java
@@ -38,17 +38,14 @@ import java.util.Map;
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class SparkStandaloneClusterResource extends UserComputationalResource {
- @NotBlank
- @JsonProperty("master_instance_count")
- private String masterDataEngineInstanceCount;
@NotBlank
@JsonProperty("master_instance_shape")
private String masterDataEngineInstanceShape;
@NotBlank
- @JsonProperty("slave_instance_count")
- private String slaveDataEngineInstanceCount;
+ @JsonProperty("data_engine_instance_count")
+ private String dataEngineInstanceCount;
@NotBlank
@JsonProperty("slave_instance_shape")
@@ -58,8 +55,8 @@ public class SparkStandaloneClusterResource extends UserComputationalResource {
public SparkStandaloneClusterResource(String computationalName, String computationalId, String imageName,
String templateName, String status, Date uptime,
SchedulerJobDTO schedulerJobData, boolean reuploadKeyRequired,
- String masterDataEngineInstanceCount, String masterDataEngineInstanceShape,
- String slaveDataEngineInstanceCount, String slaveDataEngineInstanceShape,
+ String dataEngineInstanceCount, String masterDataEngineInstanceShape,
+ String slaveDataEngineInstanceShape,
String masterGpuCount, String masterGpuType,
String slaveGpuCount, String slaveGpuType,
Boolean enabledGPU,
@@ -75,10 +72,9 @@ public class SparkStandaloneClusterResource extends UserComputationalResource {
super.setMasterNodeShape(masterDataEngineInstanceShape);
super.setSlaveNodeShape(slaveDataEngineInstanceShape);
- this.masterDataEngineInstanceCount = masterDataEngineInstanceCount;
this.masterDataEngineInstanceShape = masterDataEngineInstanceShape;
- this.slaveDataEngineInstanceCount = slaveDataEngineInstanceCount;
this.slaveDataEngineInstanceShape = slaveDataEngineInstanceShape;
+ this.dataEngineInstanceCount = dataEngineInstanceCount;
this.config = config;
}
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 419f978..be0fab2 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
@@ -359,9 +359,9 @@ public class ComputationalServiceImpl implements ComputationalService {
.imageName(form.getImage())
.templateName(form.getTemplateName())
.status(CREATING.toString())
- .masterDataEngineInstanceCount(form.getMasterDataEngineInstanceCount())
+ .dataEngineInstanceCount(String.valueOf(Integer.parseInt(form.getSlaveDataEngineInstanceCount())
+ + Integer.parseInt(form.getMasterDataEngineInstanceCount())))
.masterDataEngineInstanceShape(form.getMasterDataEngineInstanceShape())
- .slaveDataEngineInstanceCount(form.getSlaveDataEngineInstanceCount())
.slaveDataEngineInstanceShape(form.getSlaveDtaEngineInstanceShape())
.enabledGPU(form.getEnabledGPU())
.masterGpuCount(form.getMasterGpuCount())
diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImplTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImplTest.java
index e963c7a..0548251 100644
--- a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImplTest.java
+++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImplTest.java
@@ -750,7 +750,7 @@ public class ComputationalServiceImplTest {
.computationalName(COMP_NAME)
.imageName("dataengine")
.status(CREATING.toString())
- .masterDataEngineInstanceCount(String.valueOf(2))
+ .dataEngineInstanceCount(String.valueOf(2))
.tags(Collections.emptyMap())
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org