This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-2648
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2648 by this push:
new 705c716cb update image image status after termination
705c716cb is described below
commit 705c716cb85b17e5370b0b93b2f819a14c71fd3a
Author: Denys Yankiv <[email protected]>
AuthorDate: Fri Aug 26 10:21:09 2022 +0300
update image image status after termination
---
.run/prov.run.xml | 2 ++
.../java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java | 1 +
.../com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java | 5 +++++
.../epam/datalab/backendapi/resources/callback/ImageCallback.java | 3 +--
.../datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java | 2 +-
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/.run/prov.run.xml b/.run/prov.run.xml
new file mode 100644
index 000000000..1ddcf7e7f
--- /dev/null
+++ b/.run/prov.run.xml
@@ -0,0 +1,2 @@
+ <env name="DATALAB_CONF_DIR"
value="C:\Users\Denys_Yankiv\IdeaProjects\incubator-datalab\infrastructure-provisioning\src\ssn\templates"
/>
+ <option name="VM_PARAMETERS"
value="-Ddocker.dir=C:\Users\Denys_Yankiv\IdeaProjects\incubator-datalab\infrastructure-provisioning\src\general\files\aws\"
/>
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java
index be068d546..068d5ed94 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java
@@ -37,6 +37,7 @@ public interface ImageExploratoryDAO {
void updateImageFields(Image image);
void updateImageStatus(String user, String imageName, String project,
String endpoint, ImageStatus status);
+ void updateImageStatus(String fullName, ImageStatus status);
List<ImageInfoRecord> getImages(String user, String dockerImage, String
project, String endpoint, ImageStatus... statuses);
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java
index b52c35010..a1106c58d 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java
@@ -79,6 +79,11 @@ public class ImageExploratoryDAOImpl extends BaseDAO
implements ImageExploratory
updateOne(MongoCollections.IMAGES, condition,
set(STATUS,status.toString()));
}
+ @Override
+ public void updateImageStatus(String fullName, ImageStatus status) {
+ updateOne(MongoCollections.IMAGES, eq(IMAGE_FULL_NAME, fullName),
set(STATUS,status.toString()));
+ }
+
@Override
public List<ImageInfoRecord> getImages(String user, String dockerImage,
String project, String endpoint, ImageStatus... statuses) {
return find(MongoCollections.IMAGES,
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ImageCallback.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ImageCallback.java
index d66d550f3..e05cd810d 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ImageCallback.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/callback/ImageCallback.java
@@ -51,8 +51,7 @@ public class ImageCallback {
public Response imageCreateStatus(ImageCreateStatusDTO dto) {
log.debug("Updating status of image {} for user {} to {}",
dto.getName(), dto.getUser(), dto);
requestId.remove(dto.getRequestId());
-
-
if(dto.getStatus().equalsIgnoreCase(String.valueOf(ImageStatus.TERMINATED))){
+ if(dto.getImageCreateDTO().getStatus() == ImageStatus.TERMINATED){
imageExploratoryService.finishTerminateImage(dto.getImageCreateDTO().getExternalName());
} else {
imageExploratoryService.finishImageCreate(getImage(dto),
dto.getExploratoryName(), dto.getImageCreateDTO()
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
index 691800e8d..5859bb62e 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
@@ -165,7 +165,7 @@ public class ImageExploratoryServiceImpl implements
ImageExploratoryService {
@Override
public void finishTerminateImage(String fullImageName) {
-
+ imageExploratoryDao.updateImageStatus(fullImageName,
ImageStatus.TERMINATED);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
