(cloudstack) branch 4.19 updated: ssvm: reset fields on destroy (#10253)

[dahn]

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

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


The following commit(s) were added to refs/heads/4.19 by this push:
     new 005afde24ec ssvm: reset fields on destroy (#10253)
005afde24ec is described below

commit 005afde24ec181b89b62cef7b6862cd5bcf5ca33
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Thu May 15 15:40:38 2025 +0530

    ssvm: reset fields on destroy (#10253)
    
    Signed-off-by: Abhishek Kumar <abhishek.mr...@gmail.com>
---
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 94a8f367d08..2fda8576533 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
@@ -1074,6 +1074,12 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
 
         try {
             _itMgr.expunge(ssvm.getUuid());
+            ssvm.setPublicIpAddress(null);
+            ssvm.setPublicMacAddress(null);
+            ssvm.setPublicNetmask(null);
+            ssvm.setPrivateMacAddress(null);
+            ssvm.setPrivateIpAddress(null);
+            _secStorageVmDao.update(ssvm.getId(), ssvm);
             _secStorageVmDao.remove(ssvm.getId());
             HostVO host = 
_hostDao.findByTypeNameAndZoneId(ssvm.getDataCenterId(), ssvm.getHostName(), 
Host.Type.SecondaryStorageVM);
             if (host != null) {
@@ -1358,7 +1364,7 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
     @Override
     public void finalizeExpunge(VirtualMachine vm) {
         SecondaryStorageVmVO ssvm = _secStorageVmDao.findByUuid(vm.getUuid());
-
+        ssvm.setPrivateMacAddress(null);
         ssvm.setPublicIpAddress(null);
         ssvm.setPublicMacAddress(null);
         ssvm.setPublicNetmask(null);