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:36 UTC
[incubator-datalab] branch DATALAB-2430 updated (75b01b0 -> 4453695)
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a change to branch DATALAB-2430
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 75b01b0 [DATALAB-2430] -- fixed tests
add 15783c1 Merge pull request #1198 from apache/DATALAB-2430
add ada232b Merge pull request #1199 from apache/DATALAB-2430
add 5d768c3 [DATALAB-2430] -- fixed tests
add 902ead4 [DATALAB] -- fixed bugs
add 5dbc237 Merge pull request #1200 from apache/DATALAB-2317
add dfdf27d [DATALAB-2431] added gpu for Apache cluster
new 592b38b Merge branch 'DATALAB-2431' of https://github.com/apache/incubator-datalab into DATALAB-2430
new 4453695 [DATALAB-2430] -- fixed bugs with param
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../SparkStandaloneClusterResource.java | 6 +-
services/self-service/pom.xml | 2 +-
.../resources/aws/ComputationalResourceAws.java | 2 +-
.../resources/gcp/ComputationalResourceGcp.java | 12 +---
.../service/impl/ComputationalServiceImpl.java | 2 +
...utational-resource-create-dialog.component.html | 66 +++++++++++-----------
...mputational-resource-create-dialog.component.ts | 2 +
.../computational-resource-create.model.ts | 11 +++-
8 files changed, 56 insertions(+), 47 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: [DATALAB-2430] -- fixed bugs with param
Posted by yk...@apache.org.
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
[incubator-datalab] 01/02: Merge branch 'DATALAB-2431' of
https://github.com/apache/incubator-datalab into DATALAB-2430
Posted by yk...@apache.org.
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 592b38b295a3fc645d495cec53b7d5d639a08ef8
Merge: 5dbc237 dfdf27d
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Thu Jun 17 12:42:19 2021 +0300
Merge branch 'DATALAB-2431' of https://github.com/apache/incubator-datalab into DATALAB-2430
...utational-resource-create-dialog.component.html | 66 +++++++++++-----------
...mputational-resource-create-dialog.component.ts | 2 +
.../computational-resource-create.model.ts | 11 +++-
3 files changed, 45 insertions(+), 34 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org