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 7f164e5 [DATALAB] -- fixed bug with wrong count param for Spark
new ccc4afb Merge remote-tracking branch 'origin/develop' into develop
7f164e5 is described below
commit 7f164e5ef457027b76754da5ae8695a510769ab6
Author: KinashYurii <[email protected]>
AuthorDate: Tue Jun 29 11:32:29 2021 +0300
[DATALAB] -- fixed bug with wrong count param for Spark
---
.../dto/gcp/computational/SparkComputationalCreateGcp.java | 6 +++---
.../backendapi/resources/aws/ComputationalResourceAws.java | 2 +-
.../resources/dto/SparkStandaloneClusterCreateForm.java | 8 ++------
.../backendapi/service/impl/ComputationalServiceImpl.java | 6 ++----
.../com/epam/datalab/backendapi/util/RequestBuilder.java | 13 +++----------
.../service/impl/ComputationalServiceImplTest.java | 2 +-
6 files changed, 12 insertions(+), 25 deletions(-)
diff --git
a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/SparkComputationalCreateGcp.java
b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/SparkComputationalCreateGcp.java
index 097118b..c58dd6a 100644
---
a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/SparkComputationalCreateGcp.java
+++
b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/SparkComputationalCreateGcp.java
@@ -32,8 +32,8 @@ import java.util.List;
public class SparkComputationalCreateGcp extends
ComputationalBase<SparkComputationalCreateGcp> {
@JsonIgnoreProperties
- @JsonProperty("dataengine_instance_count")
- private String dataengineInstanceCount;
+ @JsonProperty("data_engine_instance_count")
+ private String dataEngineInstanceCount;
@JsonProperty("gcp_dataengine_master_size")
private String masterDataEngineInstanceShape;
@JsonProperty("gcp_dataengine_slave_size")
@@ -55,7 +55,7 @@ public class SparkComputationalCreateGcp extends
ComputationalBase<SparkComputat
private String sharedImageEnabled;
public SparkComputationalCreateGcp withDataEngineInstanceCount(String
dataengineInstanceCount) {
- this.dataengineInstanceCount = dataengineInstanceCount;
+ this.dataEngineInstanceCount = dataengineInstanceCount;
return this;
}
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/aws/ComputationalResourceAws.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/aws/ComputationalResourceAws.java
index f0f8d29..baaf397 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/aws/ComputationalResourceAws.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/aws/ComputationalResourceAws.java
@@ -217,7 +217,7 @@ public class ComputationalResourceAws implements
ComputationalAPI {
private void validate(SparkStandaloneClusterCreateForm form) {
- int instanceCount =
Integer.parseInt(form.getMasterDataEngineInstanceCount());
+ int instanceCount =
Integer.parseInt(form.getDataEngineInstanceCount());
if (instanceCount < configuration.getMinSparkInstanceCount()
|| instanceCount > configuration.getMaxSparkInstanceCount()) {
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/SparkStandaloneClusterCreateForm.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/SparkStandaloneClusterCreateForm.java
index 4510c1f..b693b2e 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/SparkStandaloneClusterCreateForm.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/SparkStandaloneClusterCreateForm.java
@@ -33,18 +33,14 @@ import org.hibernate.validator.constraints.NotBlank;
public class SparkStandaloneClusterCreateForm extends
ComputationalCreateFormDTO {
@NotBlank
- @JsonProperty("master_instance_count")
- private String masterDataEngineInstanceCount;
+ @JsonProperty("data_engine_instance_count")
+ private String dataEngineInstanceCount;
@NotBlank
@JsonProperty("master_instance_shape")
private String masterDataEngineInstanceShape;
@NotBlank
- @JsonProperty("slave_instance_count")
- private String slaveDataEngineInstanceCount;
-
- @NotBlank
@JsonProperty("slave_instance_shape")
private String slaveDtaEngineInstanceShape;
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 be0fab2..d93298b 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,8 +359,7 @@ public class ComputationalServiceImpl implements
ComputationalService {
.imageName(form.getImage())
.templateName(form.getTemplateName())
.status(CREATING.toString())
-
.dataEngineInstanceCount(String.valueOf(Integer.parseInt(form.getSlaveDataEngineInstanceCount())
- +
Integer.parseInt(form.getMasterDataEngineInstanceCount())))
+ .dataEngineInstanceCount(form.getDataEngineInstanceCount())
.masterDataEngineInstanceShape(form.getMasterDataEngineInstanceShape())
.slaveDataEngineInstanceShape(form.getSlaveDtaEngineInstanceShape())
.enabledGPU(form.getEnabledGPU())
@@ -369,8 +368,7 @@ public class ComputationalServiceImpl implements
ComputationalService {
.slaveGpuCount(form.getSlaveGpuCount())
.slaveGpuType(form.getSlaveGpuType())
.config(form.getConfig())
-
.totalInstanceCount(Integer.parseInt(form.getSlaveDataEngineInstanceCount())
- +
Integer.parseInt(form.getMasterDataEngineInstanceCount()))
+
.totalInstanceCount(Integer.parseInt(form.getDataEngineInstanceCount()))
.build();
}
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 34bad98..67c6ab6 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
@@ -391,9 +391,7 @@ public class RequestBuilder {
switch (cloudProvider) {
case AWS:
computationalCreate = (T)
newResourceSysBaseDTO(userInfo.getName(), cloudProvider,
SparkComputationalCreateAws.class)
- .withDataEngineInstanceCount(String.valueOf(
-
Integer.parseInt(form.getSlaveDataEngineInstanceCount())
- +
Integer.parseInt(form.getMasterDataEngineInstanceCount())))
+
.withDataEngineInstanceCount(form.getDataEngineInstanceCount())
.withDataEngineMasterShape(form.getMasterDataEngineInstanceShape())
.withDataEngineSlaveShape(form.getMasterDataEngineInstanceShape())
.withConfig(form.getConfig())
@@ -401,9 +399,7 @@ public class RequestBuilder {
break;
case AZURE:
computationalCreate = (T)
newResourceSysBaseDTO(userInfo.getName(), cloudProvider,
SparkComputationalCreateAzure.class)
- .withDataEngineInstanceCount(String.valueOf(
-
Integer.parseInt(form.getSlaveDataEngineInstanceCount())
- +
Integer.parseInt(form.getMasterDataEngineInstanceCount())))
+
.withDataEngineInstanceCount(form.getDataEngineInstanceCount())
.withDataEngineMasterSize(form.getMasterDataEngineInstanceShape())
.withDataEngineSlaveSize(form.getMasterDataEngineInstanceShape())
.withConfig(form.getConfig())
@@ -419,10 +415,7 @@ public class RequestBuilder {
break;
case GCP:
computationalCreate = (T)
newResourceSysBaseDTO(userInfo.getName(), cloudProvider,
SparkComputationalCreateGcp.class)
-
.withDataEngineInstanceCount(form.getMasterDataEngineInstanceCount())
- .withDataEngineInstanceCount(String.valueOf(
-
Integer.parseInt(form.getSlaveDataEngineInstanceCount())
- +
Integer.parseInt(form.getMasterDataEngineInstanceCount())))
+
.withDataEngineInstanceCount(form.getDataEngineInstanceCount())
.withDataEngineMasterSize(form.getMasterDataEngineInstanceShape())
.withDataEngineSlaveSize(form.getMasterDataEngineInstanceShape())
.withMasterGPUCount(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 0548251..0452841 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
@@ -727,7 +727,7 @@ public class ComputationalServiceImplTest {
sparkClusterForm.setNotebookName(EXPLORATORY_NAME);
sparkClusterForm.setName(COMP_NAME);
sparkClusterForm.setProject(PROJECT);
- sparkClusterForm.setMasterDataEngineInstanceCount(String.valueOf(2));
+ sparkClusterForm.setDataEngineInstanceCount(String.valueOf(2));
sparkClusterForm.setImage("dataengine");
ComputationalCreateFormDTO desClusterForm = new
ComputationalCreateFormDTO();
desClusterForm.setNotebookName(EXPLORATORY_NAME);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
