You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dy...@apache.org on 2022/11/17 14:17:16 UTC

[incubator-datalab] branch epm-v2.5.2.1 updated (528614b08 -> 230fdcb83)

This is an automated email from the ASF dual-hosted git repository.

dyankiv pushed a change to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git


    from 528614b08 increased disk size
     new 55619d8fb increased dick size
     new 15dbde4f1 Merge branch 'epm-v2.5.2.1' of https://github.com/apache/incubator-datalab into epm-v2.5.2.1
     new 230fdcb83 fix status check for failed instances

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:
 .../backendapi/schedulers/CheckInfrastructureStatusScheduler.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org


[incubator-datalab] 01/03: increased dick size

Posted by dy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dyankiv pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 55619d8fb829879328ccd04df0cf9991cf0fc3fe
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Nov 2 12:50:14 2022 +0200

    increased dick size
---
 .../src/general/scripts/gcp/common_prepare_notebook.py                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
index 7aeda0e38..f07adaec5 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
@@ -90,7 +90,7 @@ if __name__ == "__main__":
                                                                        notebook_config['project_name'],
                                                                        notebook_config['endpoint_name'],
                                                                        notebook_config['exploratory_name'])
-        notebook_config['primary_disk_size'] = (lambda x: '60' if x == 'deeplearning' else '20')(
+        notebook_config['primary_disk_size'] = (lambda x: '60' if x == 'deeplearning' else '30')(
             os.environ['application'])
         notebook_config['secondary_disk_size'] = os.environ['notebook_disk_size']
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org


[incubator-datalab] 02/03: Merge branch 'epm-v2.5.2.1' of https://github.com/apache/incubator-datalab into epm-v2.5.2.1

Posted by dy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dyankiv pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 15dbde4f14b1e57b2ccaddcbd2905c6619b0d84b
Merge: 55619d8fb 528614b08
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Thu Nov 17 16:10:41 2022 +0200

    Merge branch 'epm-v2.5.2.1' of https://github.com/apache/incubator-datalab into epm-v2.5.2.1



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org


[incubator-datalab] 03/03: fix status check for failed instances

Posted by dy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dyankiv pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 230fdcb83c6c601900cf7749cbcdc50bc24d2fb4
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Thu Nov 17 16:16:01 2022 +0200

    fix status check for failed instances
---
 .../backendapi/schedulers/CheckInfrastructureStatusScheduler.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/schedulers/CheckInfrastructureStatusScheduler.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/schedulers/CheckInfrastructureStatusScheduler.java
index e6a0b0e1d..43e55bbc1 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/schedulers/CheckInfrastructureStatusScheduler.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/schedulers/CheckInfrastructureStatusScheduler.java
@@ -51,7 +51,7 @@ import static com.epam.datalab.dto.UserInstanceStatus.*;
 public class CheckInfrastructureStatusScheduler implements Job {
 
     private static final List<UserInstanceStatus> statusesToCheck =
-            Arrays.asList(STARTING, CREATING, RUNNING, STOPPING, RECONFIGURING, STOPPED, TERMINATING, TERMINATED);
+            Arrays.asList(STARTING, CREATING, RUNNING, STOPPING, RECONFIGURING, STOPPED, TERMINATING, TERMINATED, FAILED);
 
     private final InfrastructureInfoService infrastructureInfoService;
     private final SecurityService securityService;
@@ -81,7 +81,8 @@ public class CheckInfrastructureStatusScheduler implements Job {
                 .map(EndpointDTO::getName)
                 .collect(Collectors.toList());
 
-        List<UserInstanceDTO> userInstanceDTOS = exploratoryDAO.fetchExploratoriesByEndpointWhereStatusIn(activeEndpoints, statusesToCheck, Boolean.TRUE);
+        List<UserInstanceDTO> userInstanceDTOS = exploratoryDAO.fetchExploratoriesByEndpointWhereStatusIn(activeEndpoints, statusesToCheck, Boolean.TRUE)
+        .stream().filter(e -> e.getInstanceId() != null).collect(Collectors.toList());
 
         Map<String, List<EnvResource>> exploratoryAndSparkInstances = userInstanceDTOS
                 .stream()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org