This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new fef0019 [DLAB-1914] Fixed issue with number of slaves for data engine
service
fef0019 is described below
commit fef0019782d8a989dcb00674369c9b698d54f90b
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Thu Jul 2 12:04:05 2020 +0300
[DLAB-1914] Fixed issue with number of slaves for data engine service
---
.../computational/AwsComputationalResource.java | 2 +-
.../SparkStandaloneClusterResource.java | 2 +-
.../computational/UserComputationalResource.java | 4 ++--
.../computational/GcpComputationalResource.java | 2 +-
.../resources/aws/ComputationalResourceAws.java | 2 +-
.../resources/gcp/ComputationalResourceGcp.java | 22 +++++++++++-----------
.../epam/dlab/backendapi/util/BillingUtils.java | 4 ++--
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/computational/AwsComputationalResource.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/computational/AwsComputationalResource.java
index 7b8f77b..6d4d088 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/computational/AwsComputationalResource.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/computational/AwsComputationalResource.java
@@ -63,7 +63,7 @@ public class AwsComputationalResource extends
UserComputationalResource {
String
instanceId, String masterShape, String slaveShape, Boolean slaveSpot,
Integer
slaveSpotPctPrice, String slaveNumber, String version,
List<ResourceURL> resourceURL, LocalDateTime lastActivity,
-
List<ClusterConfig> config, Map<String, String> tags, String
totalInstanceCount) {
+
List<ClusterConfig> config, Map<String, String> tags, int totalInstanceCount) {
super(computationalName, computationalId, imageName,
templateName, status, uptime, schedulerJobData,
reuploadKeyRequired, resourceURL, lastActivity,
tags, totalInstanceCount);
this.instanceId = instanceId;
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/SparkStandaloneClusterResource.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/SparkStandaloneClusterResource.java
index 80c6d5b..b3f6539 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/SparkStandaloneClusterResource.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/SparkStandaloneClusterResource.java
@@ -52,7 +52,7 @@ public class SparkStandaloneClusterResource extends
UserComputationalResource {
SchedulerJobDTO schedulerJobData, boolean reuploadKeyRequired,
String dataEngineInstanceCount, String dataEngineInstanceShape,
List<ResourceURL> resourceURL, LocalDateTime lastActivity,
-
List<ClusterConfig> config, Map<String, String> tags, String
totalInstanceCount) {
+
List<ClusterConfig> config, Map<String, String> tags, int totalInstanceCount)
{
super(computationalName, computationalId, imageName,
templateName, status, uptime, schedulerJobData,
reuploadKeyRequired, resourceURL, lastActivity,
tags, totalInstanceCount);
this.dataEngineInstanceCount = dataEngineInstanceCount;
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java
index df0892c..5f131a1 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java
@@ -67,14 +67,14 @@ public class UserComputationalResource {
private int dataengineInstanceCount;
@JsonProperty("instance_id")
private String instanceId;
- private String totalInstanceCount;
+ private int totalInstanceCount;
protected List<ClusterConfig> config;
private Map<String, String> tags;
public UserComputationalResource(String computationalName, String
computationalId, String imageName,
String
templateName, String status, Date uptime, SchedulerJobDTO schedulerData,
boolean reuploadKeyRequired, List<ResourceURL> resourceUrl,
-
LocalDateTime lastActivity, Map<String, String> tags, String
totalInstanceCount) {
+
LocalDateTime lastActivity, Map<String, String> tags, int totalInstanceCount) {
this.computationalName = computationalName;
this.computationalId = computationalId;
this.imageName = imageName;
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/computational/GcpComputationalResource.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/computational/GcpComputationalResource.java
index 5f0f103..b653818 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/computational/GcpComputationalResource.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/computational/GcpComputationalResource.java
@@ -63,7 +63,7 @@ public class GcpComputationalResource extends
UserComputationalResource {
String
instanceId, String masterShape, String slaveShape, String slaveNumber,
String
masterNumber, String preemptibleNumber, String version,
List<ResourceURL> resourceURL, LocalDateTime lastActivity,
-
Map<String, String> tags, String totalInstanceCount) {
+
Map<String, String> tags, int totalInstanceCount) {
super(computationalName, computationalId, imageName,
templateName, status, uptime, schedulerJobData,
reuploadKeyRequired, resourceURL, lastActivity,
tags, totalInstanceCount);
this.instanceId = instanceId;
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java
index be47eb7..72cffcc 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java
@@ -105,7 +105,7 @@ public class ComputationalResourceAws implements
ComputationalAPI {
.slaveNumber(form.getInstanceCount())
.config(form.getConfig())
.version(form.getVersion())
-
.totalInstanceCount(form.getInstanceCount())
+
.totalInstanceCount(Integer.parseInt(form.getInstanceCount()))
.build();
boolean resourceAdded =
computationalService.createDataEngineService(userInfo, form.getName(), form,
awsComputationalResource,
form.getProject(), getAuditInfo(form.getNotebookName()));
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java
index 8f9c832..4a01055 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java
@@ -97,17 +97,17 @@ public class ComputationalResourceGcp implements
ComputationalAPI {
if (DataEngineType.CLOUD_SERVICE ==
DataEngineType.fromDockerImageName(form.getImage())) {
validate(userInfo, form);
GcpComputationalResource gcpComputationalResource =
GcpComputationalResource.builder()
- .computationalName(form.getName())
- .imageName(form.getImage())
- .templateName(form.getTemplateName())
- .status(CREATING.toString())
- .masterShape(form.getMasterInstanceType())
- .slaveShape(form.getSlaveInstanceType())
- .slaveNumber(form.getSlaveInstanceCount())
- .masterNumber(form.getMasterInstanceCount())
- .preemptibleNumber(form.getPreemptibleCount())
- .version(form.getVersion())
- .totalInstanceCount(form.getMasterInstanceCount() +
form.getSlaveInstanceCount())
+ .computationalName(form.getName())
+ .imageName(form.getImage())
+ .templateName(form.getTemplateName())
+ .status(CREATING.toString())
+
.masterShape(form.getMasterInstanceType())
+ .slaveShape(form.getSlaveInstanceType())
+
.slaveNumber(form.getSlaveInstanceCount())
+
.masterNumber(form.getMasterInstanceCount())
+
.preemptibleNumber(form.getPreemptibleCount())
+ .version(form.getVersion())
+
.totalInstanceCount(Integer.parseInt(form.getMasterInstanceCount()) +
Integer.parseInt(form.getSlaveInstanceCount()))
.build();
boolean resourceAdded =
computationalService.createDataEngineService(userInfo, form.getName(), form,
gcpComputationalResource,
form.getProject(), getAuditInfo(form.getNotebookName()));
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java
index bfe704b..91e4809 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java
@@ -70,7 +70,7 @@ public class BillingUtils {
private static final String IMAGE_NAME = "Image";
private static final String DATAENGINE_NAME_FORMAT = "%d x %s";
- private static final String DATAENGINE_SERVICE_NAME_FORMAT = "Master:
%sSlave: %s x %s";
+ private static final String DATAENGINE_SERVICE_NAME_FORMAT = "Master:
%sSlave: %d x %s";
public static Stream<BillingReportLine> edgeBillingDataStream(String
project, String sbn, String endpoint) {
final String userEdgeId = String.format(EDGE_FORMAT, sbn, project,
endpoint).toLowerCase();
@@ -160,7 +160,7 @@ public class BillingUtils {
public static String getComputationalShape(UserComputationalResource
resource) {
return DataEngineType.fromDockerImageName(resource.getImageName()) ==
DataEngineType.SPARK_STANDALONE ?
String.format(DATAENGINE_NAME_FORMAT,
resource.getDataengineInstanceCount(), resource.getDataengineShape()) :
- String.format(DATAENGINE_SERVICE_NAME_FORMAT,
resource.getMasterNodeShape(), resource.getTotalInstanceCount(),
resource.getSlaveNodeShape());
+ String.format(DATAENGINE_SERVICE_NAME_FORMAT,
resource.getMasterNodeShape(), resource.getTotalInstanceCount() - 1,
resource.getSlaveNodeShape());
}
private static Stream<BillingReportLine>
standardImageBillingDataStream(String sbn, String endpoint) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
