etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9964: Snapahots are getting deleted if VM is assigned to another user (#2159)

This commit is contained in:
pavanaravapalli 2017-08-20 00:41:45 +05:30 committed by Rohit Yadav
parent a40e0f0097
commit 250c47eb62
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -297,6 +297,7 @@ import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.snapshot.VMSnapshotManager;
import com.cloud.vm.snapshot.VMSnapshotVO;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
import com.cloud.storage.snapshot.SnapshotApiService;
public class UserVmManagerImpl extends ManagerBase implements UserVmManager, VirtualMachineGuru, UserVmService, Configurable {
private static final Logger s_logger = Logger.getLogger(UserVmManagerImpl.class);
@ -487,6 +488,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
protected VMNetworkMapDao _vmNetworkMapDao;
@Inject
protected IpAddressManager _ipAddrMgr;
@Inject
private SnapshotApiService _snapshotService;
protected ScheduledExecutorService _executor = null;
protected ScheduledExecutorService _vmIpFetchExecutor = null;
@ -5386,7 +5389,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
//snapshots: mark these removed in db
List<SnapshotVO> snapshots = _snapshotDao.listByVolumeIdIncludingRemoved(volume.getId());
for (SnapshotVO snapshot : snapshots) {
_snapshotDao.remove(snapshot.getId());
boolean result = _snapshotService.deleteSnapshot(snapshot.getId());
if (result) {
s_logger.info("Snapshot id: " + snapshot.getId() + " delete successfully ");
} else {
s_logger.error("Unable to delete Snapshot id: " + snapshot.getId());
}
}
}