[cloudstack] branch 4.16 updated: Update proper destroy status when SSVM is destroyed. (#5908)

[sureshanaparti]

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

sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.16 by this push:
     new 1b3e7f6  Update proper destroy status when SSVM is destroyed. (#5908)
1b3e7f6 is described below

commit 1b3e7f65b7b0ddf6a8bfbd69ae3783356dfc944f
Author: sureshanaparti <12028987+sureshanapa...@users.noreply.github.com>
AuthorDate: Wed Feb 2 10:02:00 2022 +0530

    Update proper destroy status when SSVM is destroyed. (#5908)
---
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 99539a2..44e8a11 100644
--- 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -1036,12 +1036,10 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
             if (host != null) {
                 s_logger.debug(String.format("Removing host entry for 
secondary storage VM [%s].", vmId));
                 _hostDao.remove(host.getId());
-
                 _tmplStoreDao.expireDnldUrlsForZone(host.getDataCenterId());
                 _volumeStoreDao.expireDnldUrlsForZone(host.getDataCenterId());
-                return true;
             }
-            return false;
+            return true;
         } catch (ResourceUnavailableException e) {
             s_logger.error(String.format("Unable to expunge secondary storage 
[%s] due to [%s].", ssvm.toString(), e.getMessage()), e);
             return false;