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/17 14:12:38 UTC
[incubator-datalab] 02/02: [DATALAB-2430] -- fixed bugs with param
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2430
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 4453695366ca8bdb5a748d4f00b7643d1bc06ac9
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Thu Jun 17 17:08:13 2021 +0300
[DATALAB-2430] -- fixed bugs with param
---
.../datalab/dto/computational/SparkStandaloneClusterResource.java | 6 ++++--
.../datalab/backendapi/service/impl/ComputationalServiceImpl.java | 2 ++
2 files changed, 6 insertions(+), 2 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 d06e4c9..3cd1981 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
@@ -52,7 +52,7 @@ public class SparkStandaloneClusterResource extends UserComputationalResource {
@NotBlank
@JsonProperty("slave_instance_shape")
- private String slaveDtaEngineInstanceShape;
+ private String slaveDataEngineInstanceShape;
@Builder
public SparkStandaloneClusterResource(String computationalName, String computationalId, String imageName,
@@ -72,11 +72,13 @@ public class SparkStandaloneClusterResource extends UserComputationalResource {
super.setSlaveGpuCount(slaveGpuCount);
super.setSlaveGpuType(slaveGpuType);
super.setEnabledGPU(enabledGPU);
+ super.setMasterNodeShape(masterDataEngineInstanceShape);
+ super.setSlaveNodeShape(slaveDataEngineInstanceShape);
this.masterDataEngineInstanceCount = masterDataEngineInstanceCount;
this.masterDataEngineInstanceShape = masterDataEngineInstanceShape;
this.slaveDataEngineInstanceCount = slaveDataEngineInstanceCount;
- this.slaveDtaEngineInstanceShape = slaveDataEngineInstanceShape;
+ this.slaveDataEngineInstanceShape = slaveDataEngineInstanceShape;
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 9d023a9..419f978 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
@@ -369,6 +369,8 @@ public class ComputationalServiceImpl implements ComputationalService {
.slaveGpuCount(form.getSlaveGpuCount())
.slaveGpuType(form.getSlaveGpuType())
.config(form.getConfig())
+ .totalInstanceCount(Integer.parseInt(form.getSlaveDataEngineInstanceCount())
+ + Integer.parseInt(form.getMasterDataEngineInstanceCount()))
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org