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/04/28 10:27:27 UTC
[incubator-datalab] branch DATALAB-2091 updated (ac8367e -> 2fec2c5)
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from ac8367e Merge branch 'DATALAB-2091' of https://github.com/apache/incubator-dlab into DATALAB-2091
new a63e356 [DATALAB-2352] - remove gpu_types from desc.json files
new e549c09 [DATALAB-2352] - refactoring
new 2fec2c5 Merge remote-tracking branch 'origin/DATALAB-2091' into DATALAB-2091
The 3 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:
.../src/general/files/aws/jupyter_description.json | 4 ----
.../src/general/files/azure/jupyter_description.json | 4 ----
.../src/general/files/gcp/dataengine-service_description.json | 6 +-----
.../src/general/files/gcp/jupyter_description.json | 4 ----
.../src/general/files/gcp/jupyterlab_description.json | 4 ----
.../epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java | 2 ++
.../com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java | 2 ++
.../epam/datalab/backendapi/core/commands/CommandParserMock.java | 4 +++-
.../backendapi/core/response/handlers/BackupCallbackHandler.java | 1 -
.../backendapi/service/impl/InfrastructureTemplateServiceImpl.java | 7 ++++++-
10 files changed, 14 insertions(+), 24 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 03/03: Merge remote-tracking branch
'origin/DATALAB-2091' into DATALAB-2091
Posted by yk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 2fec2c591381f44bc2149872a3ae81645aa4c55a
Merge: e549c09 ac8367e
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Wed Apr 28 13:27:13 2021 +0300
Merge remote-tracking branch 'origin/DATALAB-2091' into DATALAB-2091
.../general/scripts/aws/jupyter_install_dataengine-service_kernels.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/03: [DATALAB-2352] - refactoring
Posted by yk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit e549c095241e29deac95dc517e8dd49de57d55a5
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Wed Apr 28 13:26:17 2021 +0300
[DATALAB-2352] - refactoring
---
.../epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java | 2 ++
.../com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java | 2 ++
.../epam/datalab/backendapi/core/commands/CommandParserMock.java | 4 +++-
.../backendapi/core/response/handlers/BackupCallbackHandler.java | 1 -
.../backendapi/service/impl/InfrastructureTemplateServiceImpl.java | 7 ++++++-
5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
index 83ace74..9d50136 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
@@ -20,6 +20,7 @@
package com.epam.datalab.dto.imagemetadata;
import com.epam.datalab.dto.base.edge.GPU;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,6 +32,7 @@ import java.util.Map;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties
public class ComputationalMetadataDTO extends ImageMetadataDTO {
@JsonProperty
protected String image;
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
index 5571db2..a919ed7 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
@@ -21,6 +21,7 @@
package com.epam.datalab.dto.imagemetadata;
import com.epam.datalab.dto.base.edge.GPU;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.util.List;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties
public class ExploratoryMetadataDTO extends ImageMetadataDTO {
@JsonProperty
protected String image;
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandParserMock.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandParserMock.java
index 90659d9..e61f06b 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandParserMock.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandParserMock.java
@@ -214,8 +214,10 @@ public class CommandParserMock {
*/
private Pair<String, String> getPair(String argName, String value, String separator) {
String[] array = value.split(separator);
- if (array.length != 2) {
+ if (array.length == 2) {
return new ImmutablePair<>(array[0], array[1]);
+ } else if (array.length == 3) {
+ return new ImmutablePair<>(array[1], array[2]);
}
throw new DatalabException("Invalid value for \"" + argName + "\": " + value);
}
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/BackupCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/BackupCallbackHandler.java
index 40fa2dd..d8309b5 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/BackupCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/BackupCallbackHandler.java
@@ -122,5 +122,4 @@ public class BackupCallbackHandler implements FileHandlerCallback {
.withStatus(status)
.withUser(user);
}
-
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
index cc659c5..55cccfc 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
@@ -256,6 +256,11 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
}
private void addGpu(ExploratoryMetadataDTO e, String projectName) {
- gpuDAO.getGPUByProjectName(projectName).ifPresent(x -> x.setGpus(x.getGpus()));
+ try {
+ gpuDAO.getGPUByProjectName(projectName).ifPresent(x -> e.setComputationGPU(x.getGpus()));
+ } catch (Exception ex) {
+ log.info(ex.getMessage());
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/03: [DATALAB-2352] - remove gpu_types from
desc.json files
Posted by yk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a63e356148591d14e9e5ede03659d2c0b1095c74
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Tue Apr 27 15:08:46 2021 +0300
[DATALAB-2352] - remove gpu_types from desc.json files
---
.../src/general/files/aws/jupyter_description.json | 4 ----
.../src/general/files/azure/jupyter_description.json | 4 ----
.../src/general/files/gcp/dataengine-service_description.json | 6 +-----
.../src/general/files/gcp/jupyter_description.json | 4 ----
.../src/general/files/gcp/jupyterlab_description.json | 4 ----
5 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/infrastructure-provisioning/src/general/files/aws/jupyter_description.json b/infrastructure-provisioning/src/general/files/aws/jupyter_description.json
index ceb8614..accfd94 100644
--- a/infrastructure-provisioning/src/general/files/aws/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/aws/jupyter_description.json
@@ -25,9 +25,5 @@
"version": "jupyter_notebook-6.1.6",
"vendor": "AWS"
}
- ],
- "gpu_types": [
- {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
- {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
]
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/files/azure/jupyter_description.json b/infrastructure-provisioning/src/general/files/azure/jupyter_description.json
index 2b02a1b..33ed451 100644
--- a/infrastructure-provisioning/src/general/files/azure/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/azure/jupyter_description.json
@@ -21,9 +21,5 @@
"version": "jupyter_notebook-6.1.6",
"vendor": "Azure"
}
- ],
- "gpu_types": [
- {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
- {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
]
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json b/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
index 183fc0c..f6b78f7 100644
--- a/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
@@ -26,9 +26,5 @@
"templates":
[
{"version":"2.0.0-RC22-ubuntu18", "applications": [{"Name":"Hadoop", "Version": "2.10.0"}, {"Name":"Spark", "Version": "2.4.5"}, {"Name":"Hive", "Version": "2.3.6"}]}
- ],
- "gpu_types": [
- {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
- {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
- ]
+ ]
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json b/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
index ac0ad54..1eafbed 100644
--- a/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
@@ -29,9 +29,5 @@
"version": "jupyter_notebook-6.1.6",
"vendor": "GCP"
}
- ],
- "gpu_types": [
- {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
- {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
]
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json b/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
index 7615562..3f202f7 100644
--- a/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
@@ -29,9 +29,5 @@
"version": "jupyter_lab-0.35.6",
"vendor": "GCP"
}
- ],
- "gpu_types": [
- {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
- {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
]
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org