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/27 04:53:25 UTC
[incubator-datalab] branch DATALAB-2314 updated (27fbd82 -> f6ded75)
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a change to branch DATALAB-2314
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 27fbd82 Merge branch 'develop' of https://github.com/apache/incubator-datalab into DATALAB-2314
add ff19d49 Merge pull request #1135 from apache/DATALAB-2314
add 1176bbf Added missed licence for some .java files
add 9029790 Merge pull request #1136 from apache/LICENCE-FIX
add 0fcb530 [DATALAB-1724]: added necessary for termination tags to project nat route tables, added Name tag for ssn route table
add b582832 [DATALAB-1724]: added Name tag for route table
add a62f5f2 Merge pull request #1138 from apache/DATALAB-1724
add bf4e735 [DATALAB-2366] changed messages for service restarting on confirmation dialog
add 64e4a0b Merge pull request #1139 from apache/DATALAB-2366
add 8d6ed67 [DATALAB-2367] fixed bug with discarding changes for external endpoint
add 2d42fc5 Merge pull request #1140 from apache/DATALAB-2367
add a1eb2bc [DATALAB-1724]: added removal of project route tables during project termination and in case of failure during project creation
add 2468b1a [DATALAB-1724]: moved route table removal to be after subnet removal
add e58aceb Merge pull request #1141 from apache/DATALAB-1724
add a4af6a9 [DATALAB-2361]: added warn_only True to luarocks install
add 7f5fe9b Merge pull request #1142 from apache/DATALAB-2361
add 500b0ce [DATALAB-2359] fixed bug, when it was allowed to restart provisioning service, if one of resource is in processing stage(notebook, cluster and project)
add ea5e784 Merge pull request #1143 from apache/DATALAB-2359
new f6ded75 [DATALAB-2314/2369] - fixed bugs
The 1 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/lib/aws/actions_lib.py | 12 ++++--
.../src/general/lib/os/debian/edge_lib.py | 6 ++-
.../scripts/aws/edge_configure_route_table.py | 3 +-
.../src/general/scripts/aws/project_prepare.py | 7 +++-
.../src/general/scripts/aws/project_terminate.py | 6 +++
.../src/general/scripts/aws/ssn_create_endpoint.py | 1 +
.../datalab/properties/ChangePropertiesConst.java | 24 +++++++++--
.../properties/ChangePropertiesService.java | 19 +++++++++
.../properties/ExternalChangeProperties.java | 32 +++++++++++----
.../com/epam/datalab/properties/RestartForm.java | 19 +++++++++
.../java/com/epam/datalab/properties/YmlDTO.java | 19 +++++++++
.../DynamicChangePropertiesExceptionMapper.java | 19 +++++++++
.../backendapi/ProvisioningServiceApplication.java | 1 -
.../datalab/backendapi/core/DockerWarmuper.java | 1 -
.../datalab/backendapi/core/MetadataHolder.java | 1 -
.../backendapi/core/commands/DockerCommands.java | 1 -
.../backendapi/core/commands/ICommandExecutor.java | 1 +
.../response/folderlistener/AsyncFileHandler.java | 1 -
.../response/folderlistener/FolderListener.java | 1 -
.../core/response/folderlistener/WatchItem.java | 1 -
.../response/folderlistener/WatchItemList.java | 1 -
.../handlers/CheckInactivityCallbackHandler.java | 1 +
.../handlers/ResourcesStatusCallbackHandler.java | 1 -
.../handlers/ReuploadKeyCallbackHandler.java | 1 +
.../resources/ChangePropertiesResource.java | 19 +++++++++
.../resources/ProvisioningHealthCheckResource.java | 1 -
.../resources/base/InfrastructureService.java | 1 -
.../backendapi/resources/base/KeyResource.java | 1 -
.../process/builder/ProcessInfoBuilder.java | 1 +
.../process/exception/DatalabProcessException.java | 1 +
.../com/epam/datalab/process/model/ProcessId.java | 1 +
.../epam/datalab/process/model/ProcessInfo.java | 1 +
.../epam/datalab/backendapi/dao/BillingDAO.java | 1 +
.../datalab/backendapi/dao/ComputationalDAO.java | 1 -
.../resources/ChangePropertiesResource.java | 23 ++++++++++-
.../backendapi/resources/ExploratoryResource.java | 2 +-
.../backendapi/resources/SchedulerJobResource.java | 2 +-
.../backendapi/resources/SystemInfoResource.java | 2 +-
.../backendapi/resources/UserSettingsResource.java | 2 +-
.../resources/aws/ComputationalResourceAws.java | 1 -
.../configuration/configuration.component.ts | 48 ++++++++++++++--------
41 files changed, 232 insertions(+), 55 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2314/2369] - fixed bugs
Posted by yk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2314
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit f6ded756b24098d524300a4aa9dfc3971cfad405
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Tue Apr 27 07:52:26 2021 +0300
[DATALAB-2314/2369] - fixed bugs
---
.../com/epam/datalab/properties/ChangePropertiesConst.java | 5 ++---
.../epam/datalab/properties/ExternalChangeProperties.java | 13 +++++--------
.../backendapi/resources/ChangePropertiesResource.java | 4 ++--
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesConst.java b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesConst.java
index d4985ae..fe7bcd3 100644
--- a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesConst.java
+++ b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesConst.java
@@ -36,10 +36,9 @@ public interface ChangePropertiesConst {
String BILLING_SERVICE_PROP_PATH = "/opt/datalab/conf/billing.yml";
String GKE_BILLING_PATH = "/root/billing.yaml";
String GKE_BILLING_SERVICE = "billing.yml";
- String RESTART_URL = "/api/config/restart";
+ String RESTART_URL = "/config/restart";
String LOCAL_ENDPOINT_NAME = "local";
- String BASE_CONFIG_URL = "/api/config";
- String EXTERNAL_OVERWRITE_URL = "/api/config/";
+ String BASE_CONFIG_URL = "/config";
String SELF_SERVICE_SUPERVISORCTL_RUN_NAME = " ui ";
String PROVISIONING_SERVICE_SUPERVISORCTL_RUN_NAME = " provserv ";
diff --git a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ExternalChangeProperties.java b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ExternalChangeProperties.java
index 3ad2875..7c6bdd1 100644
--- a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ExternalChangeProperties.java
+++ b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ExternalChangeProperties.java
@@ -32,15 +32,12 @@ import java.util.Map;
@Slf4j
public class ExternalChangeProperties implements ChangePropertiesConst {
- private final RESTService externalService;
private final RESTService provService;
private final ChangePropertiesService changePropertiesService;
@Inject
- public ExternalChangeProperties(RESTService externalService,
- @Named(ServiceConsts.PROVISIONING_SERVICE_NAME) RESTService provService,
+ public ExternalChangeProperties(@Named(ServiceConsts.PROVISIONING_SERVICE_NAME) RESTService provService,
ChangePropertiesService changePropertiesService) {
- this.externalService = externalService;
this.provService = provService;
this.changePropertiesService = changePropertiesService;
}
@@ -70,11 +67,11 @@ public class ExternalChangeProperties implements ChangePropertiesConst {
String provPath = url + "/provisioning-service";
log.info("TEST LOG!!!: provPath: {}", provPath);
properties.put(PROVISIONING_SERVICE,
- externalService.get(provPath, userInfo.getAccessToken(), String.class));
+ provService.get(provPath, userInfo.getAccessToken(), String.class));
String billPath = url + "/billing";
log.info("TEST LOG!!!: provPath: {}", provPath);
properties.put(BILLING_SERVICE,
- externalService.get(billPath, userInfo.getAccessToken(), String.class));
+ provService.get(billPath, userInfo.getAccessToken(), String.class));
}
return properties;
}
@@ -91,7 +88,7 @@ public class ExternalChangeProperties implements ChangePropertiesConst {
url += findMethodName(name);
log.info("TEST LOG: on external call method , url for the next step: {}", url);
- externalService.post(url, ymlDTO.getYmlString(), userInfo.getAccessToken(), String.class);
+ provService.post(url, ymlDTO.getYmlString(), userInfo.getAccessToken(), String.class);
}
}
@@ -104,7 +101,7 @@ public class ExternalChangeProperties implements ChangePropertiesConst {
changePropertiesService.restart(restartForm);
} else {
log.info("External request for endpoint {}, for user {}", restartForm.getEndpoint(), userInfo.getSimpleName());
- externalService.post(url, userInfo.getAccessToken(), restartForm, Void.class);
+ provService.post(url, userInfo.getAccessToken(), restartForm, Void.class);
}
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
index 7d0dafc..0e6d032 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
@@ -93,7 +93,7 @@ public class ChangePropertiesResource implements ChangePropertiesConst {
@Path("/multiple/provisioning-service")
public Response overwriteExternalProvisioningServiceProperties(@Auth UserInfo userInfo, YmlDTO ymlDTO) {
if (UserRoles.isAdmin(userInfo)) {
- String url = findEndpointDTOUrl(ymlDTO.getEndpointName()) + EXTERNAL_OVERWRITE_URL;
+ String url = findEndpointDTOUrl(ymlDTO.getEndpointName()) + BASE_CONFIG_URL;
log.info("TEST LOG: on /multiple method, url for the next step: {}", url);
externalChangeProperties.overwritePropertiesWithExternal(PROVISIONING_SERVICE_PROP_PATH, PROVISIONING_SERVICE,
ymlDTO, userInfo, url);
@@ -109,7 +109,7 @@ public class ChangePropertiesResource implements ChangePropertiesConst {
@Path("/multiple/billing")
public Response overwriteExternalBillingProperties(@Auth UserInfo userInfo, YmlDTO ymlDTO) {
if (UserRoles.isAdmin(userInfo)) {
- String url = findEndpointDTOUrl(ymlDTO.getEndpointName()) + EXTERNAL_OVERWRITE_URL;
+ String url = findEndpointDTOUrl(ymlDTO.getEndpointName()) + BASE_CONFIG_URL;
log.info("TEST LOG: on /multiple method, url for the next step: {}", url);
externalChangeProperties.overwritePropertiesWithExternal(BILLING_SERVICE_PROP_PATH, BILLING_SERVICE,
ymlDTO, userInfo, url);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org