Skip to content

Commit 8f5b7c1

Browse files
shwstpprdhslove
authored andcommitted
ssvm: reset fields on destroy (apache#10253)
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 8676810 commit 8f5b7c1

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
@@ -1089,6 +1089,12 @@ public boolean destroySecStorageVm(long vmId) {
10891089

10901090
try {
10911091
_itMgr.expunge(ssvm.getUuid());
1092+
ssvm.setPublicIpAddress(null);
1093+
ssvm.setPublicMacAddress(null);
1094+
ssvm.setPublicNetmask(null);
1095+
ssvm.setPrivateMacAddress(null);
1096+
ssvm.setPrivateIpAddress(null);
1097+
_secStorageVmDao.update(ssvm.getId(), ssvm);
10921098
_secStorageVmDao.remove(ssvm.getId());
10931099
HostVO host = _hostDao.findByTypeNameAndZoneId(ssvm.getDataCenterId(), ssvm.getHostName(), Host.Type.SecondaryStorageVM);
10941100
if (host != null) {
@@ -1373,7 +1379,7 @@ public void finalizeStop(VirtualMachineProfile profile, Answer answer) {
13731379
@Override
13741380
public void finalizeExpunge(VirtualMachine vm) {
13751381
SecondaryStorageVmVO ssvm = _secStorageVmDao.findByUuid(vm.getUuid());
1376-
1382+
ssvm.setPrivateMacAddress(null);
13771383
ssvm.setPublicIpAddress(null);
13781384
ssvm.setPublicMacAddress(null);
13791385
ssvm.setPublicNetmask(null);

0 commit comments

Comments
 (0)