Skip to content

Commit 4001f76

Browse files
committed
ssvm: reset fields on destroy
Fixes #8103 Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 9967bb3 commit 4001f76

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,12 @@ public boolean destroySecStorageVm(long vmId) {
10741074

10751075
try {
10761076
_itMgr.expunge(ssvm.getUuid());
1077+
ssvm.setPublicIpAddress(null);
1078+
ssvm.setPublicMacAddress(null);
1079+
ssvm.setPublicNetmask(null);
1080+
ssvm.setPrivateMacAddress(null);
1081+
ssvm.setPrivateIpAddress(null);
1082+
_secStorageVmDao.update(ssvm.getId(), ssvm);
10771083
_secStorageVmDao.remove(ssvm.getId());
10781084
HostVO host = _hostDao.findByTypeNameAndZoneId(ssvm.getDataCenterId(), ssvm.getHostName(), Host.Type.SecondaryStorageVM);
10791085
if (host != null) {
@@ -1358,7 +1364,7 @@ public void finalizeStop(VirtualMachineProfile profile, Answer answer) {
13581364
@Override
13591365
public void finalizeExpunge(VirtualMachine vm) {
13601366
SecondaryStorageVmVO ssvm = _secStorageVmDao.findByUuid(vm.getUuid());
1361-
1367+
ssvm.setPrivateMacAddress(null);
13621368
ssvm.setPublicIpAddress(null);
13631369
ssvm.setPublicMacAddress(null);
13641370
ssvm.setPublicNetmask(null);

0 commit comments

Comments
 (0)