You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/02/19 09:51:54 UTC
[incubator-dlab] branch DLAB-1541 updated: [DLAB-1541] Fixed bugs
with libs and comp resource statuses
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1541
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1541 by this push:
new 08f1dc3 [DLAB-1541] Fixed bugs with libs and comp resource statuses
08f1dc3 is described below
commit 08f1dc32abc0f44df4f9e9aa278900f703673d12
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Wed Feb 19 11:51:35 2020 +0200
[DLAB-1541] Fixed bugs with libs and comp resource statuses
---
.../response/handlers/ComputationalConfigureCallbackHandler.java | 1 +
.../core/response/handlers/LibInstallCallbackHandler.java | 5 +++--
.../src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java | 2 +-
.../dlab/backendapi/resources/callback/ComputationalCallback.java | 6 +++---
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ComputationalConfigureCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ComputationalConfigureCallbackHandler.java
index c53c86e..8d6e794 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ComputationalConfigureCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ComputationalConfigureCallbackHandler.java
@@ -56,6 +56,7 @@ public class ComputationalConfigureCallbackHandler extends ResourceCallbackHandl
return baseStatus
.withExploratoryName(dto.getExploratoryName())
.withComputationalName(dto.getComputationalName())
+ .withProject(dto.getProject())
.withUptime(null)
.withLastActivity(Date.from(Instant.now()));
}
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/LibInstallCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/LibInstallCallbackHandler.java
index a31fea3..8d46b60 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/LibInstallCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/LibInstallCallbackHandler.java
@@ -111,7 +111,8 @@ public class LibInstallCallbackHandler extends ResourceCallbackHandler<LibInstal
protected LibInstallStatusDTO getBaseStatusDTO(UserInstanceStatus status) {
return super.getBaseStatusDTO(status)
.withExploratoryName(dto.getExploratoryName())
- .withUptime(Date.from(Instant.now()))
- .withComputationalName(dto.getComputationalName());
+ .withComputationalName(dto.getComputationalName())
+ .withProject(dto.getProject())
+ .withUptime(Date.from(Instant.now()));
}
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
index 6b14599..e634487 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
@@ -91,7 +91,7 @@ public class ExploratoryDAO extends BaseDAO {
}
static Bson exploratoryCondition(String user, String exploratoryName, String project) {
- return and(eq(USER, user), eq(PROJECT, project), eq(EXPLORATORY_NAME, exploratoryName));
+ return and(eq(USER, user), eq(EXPLORATORY_NAME, exploratoryName), eq(PROJECT, project));
}
private static Bson runningExploratoryCondition(String user, String exploratoryName, String project) {
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ComputationalCallback.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ComputationalCallback.java
index b60f34c..2b286b5 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ComputationalCallback.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ComputationalCallback.java
@@ -74,9 +74,9 @@ public class ComputationalCallback {
UserComputationalResource compResource = computationalService.getComputationalResource(dto.getUser(), dto.getProject(),
dto.getExploratoryName(), dto.getComputationalName())
.orElseThrow(() ->
- new DlabException("Computational resource " + dto.getComputationalName() +
- " of exploratory environment " + dto.getExploratoryName() + " for user " + dto.getUser() +
- " doesn't exist"));
+ new DlabException(String.format("Computational resource %s of exploratory environment %s of " +
+ "project %s for user %s doesn't exist", dto.getComputationalName(),
+ dto.getExploratoryName(), dto.getProject(), dto.getUser())));
log.debug("Current status for computational resource {} of exploratory environment {} for user {} is {}",
dto.getComputationalName(), dto.getExploratoryName(), dto.getUser(),
compResource.getStatus());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org