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/07 12:08:02 UTC
[incubator-datalab] branch develop updated: [DATALAB-2422,
2425] -- hotfix
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 8e7f550 [DATALAB-2422,2425] -- hotfix
8e7f550 is described below
commit 8e7f550bf8b6f470362c74cc63c6e2f0c8c9c6f9
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Mon Jun 7 15:07:47 2021 +0300
[DATALAB-2422,2425] -- hotfix
---
.../gcp/computational/GcpComputationalResource.java | 20 +++++++++++++-------
.../resources/gcp/ComputationalResourceGcp.java | 6 ++++--
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
index de62280..554f3a6 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
@@ -55,10 +55,14 @@ public class GcpComputationalResource extends UserComputationalResource {
private final String preemptibleNumber;
@JsonProperty("dataproc_version")
private final String version;
- @JsonProperty("masterGPUType")
+ @JsonProperty("master_gpu_type")
private final String masterGPUType;
- @JsonProperty("masterGPUCount")
+ @JsonProperty("master_gpu_count")
private final String masterGPUCount;
+ @JsonProperty("masterGPUType")
+ private final String slaveGPUType;
+ @JsonProperty("masterGPUCount")
+ private final String slaveGPUCount;
private final Boolean enabledGPU;
@Builder
@@ -69,7 +73,7 @@ public class GcpComputationalResource extends UserComputationalResource {
String masterNumber, String preemptibleNumber, String version,
List<ResourceURL> resourceURL, LocalDateTime lastActivity,
Map<String, String> tags, int totalInstanceCount,
- String gpuCount, String gpuType, Boolean enabledGPU) {
+ String masterGPUCount, String masterGPUType, String slaveGPUType, String slaveGPUCount, Boolean enabledGPU) {
super(computationalName, computationalId, imageName, templateName, status, uptime, schedulerJobData,
reuploadKeyRequired, resourceURL, lastActivity, tags, totalInstanceCount);
this.instanceId = instanceId;
@@ -79,11 +83,13 @@ public class GcpComputationalResource extends UserComputationalResource {
this.masterNumber = masterNumber;
this.version = version;
this.preemptibleNumber = preemptibleNumber;
- this.masterGPUCount = gpuCount;
- this.masterGPUType = gpuType;
+ this.masterGPUCount = masterGPUCount;
+ this.masterGPUType = masterGPUType;
+ this.slaveGPUType = slaveGPUType;
+ this.slaveGPUCount = slaveGPUCount;
this.enabledGPU = enabledGPU;
- super.setGpuCount(masterGPUCount);
- super.setGpuType(masterGPUType);
+ super.setGpuCount(this.masterGPUCount);
+ super.setGpuType(this.masterGPUType);
super.setEnabledGPU(enabledGPU);
}
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
index 00310c9..2b6c719 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
@@ -101,8 +101,10 @@ public class ComputationalResourceGcp implements ComputationalAPI {
.imageName(form.getImage())
.templateName(form.getTemplateName())
.status(CREATING.toString())
- .gpuCount(form.getGpuCount())
- .gpuType(form.getGpuCount())
+ .masterGPUType(form.getMasterGpuCount())
+ .masterGPUCount(form.getMasterGpuType())
+ .slaveGPUCount(form.getSlaveGpuCount())
+ .slaveGPUType(form.getSlaveGpuType())
.enabledGPU(form.getEnabledGPU())
.masterShape(form.getMasterInstanceType())
.slaveShape(form.getSlaveInstanceType())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org