cleanup

Author: Damans227

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -2308,12 +2308,12 @@ protected void cleanupSnapshotRecordsInPrimaryStorageOnly(VolumeVO volume) {
             if (Snapshot.State.Destroyed.equals(snapshot.getState())) {
                 continue;
             }
-            List<SnapshotDataStoreVO> primaryRefs = _snapshotStoreDao.listBySnapshotAndDataStoreRole(snapshot.getId(), DataStoreRole.Primary);
-            List<SnapshotDataStoreVO> secondaryRefs = _snapshotStoreDao.listBySnapshotAndDataStoreRole(snapshot.getId(), DataStoreRole.Image);
-            if (CollectionUtils.isNotEmpty(primaryRefs) && CollectionUtils.isEmpty(secondaryRefs)) {
+            List<SnapshotDataStoreVO> snapshotsOnPrimaryStorage = _snapshotStoreDao.listBySnapshotAndDataStoreRole(snapshot.getId(), DataStoreRole.Primary);
+            List<SnapshotDataStoreVO> snapshotsOnSecondaryStorage = _snapshotStoreDao.listBySnapshotAndDataStoreRole(snapshot.getId(), DataStoreRole.Image);
+            if (CollectionUtils.isNotEmpty(snapshotsOnPrimaryStorage) && CollectionUtils.isEmpty(snapshotsOnSecondaryStorage)) {
                 logger.info("Cleaning up snapshot {} (primary-only, no secondary copy) as volume {} is being deleted", snapshot, volume);
-                for (SnapshotDataStoreVO ref : primaryRefs) {
-                    _snapshotStoreDao.expunge(ref.getId());
+                for (SnapshotDataStoreVO snapshotOnPrimaryStorage : snapshotsOnPrimaryStorage) {
+                    _snapshotStoreDao.expunge(snapshotOnPrimaryStorage.getId());
                 }
                 snapshot.setState(Snapshot.State.Destroyed);
                 _snapshotDao.update(snapshot.getId(), snapshot);

server/src/test/java/com/cloud/storage/StorageManagerImplTest.java

@@ -1735,9 +1735,9 @@ public void testCleanupSnapshotRecordsInPrimaryStorageOnly() {
         Mockito.when(snapshot.getState()).thenReturn(Snapshot.State.BackedUp);
         Mockito.when(snapshotDao.listByVolumeId(1L)).thenReturn(List.of(snapshot));
 
-        SnapshotDataStoreVO primaryRef = Mockito.mock(SnapshotDataStoreVO.class);
-        Mockito.when(primaryRef.getId()).thenReturn(100L);
-        Mockito.when(snapshotStoreDao.listBySnapshotAndDataStoreRole(10L, DataStoreRole.Primary)).thenReturn(List.of(primaryRef));
+        SnapshotDataStoreVO snapshotOnPrimaryStorage = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotOnPrimaryStorage.getId()).thenReturn(100L);
+        Mockito.when(snapshotStoreDao.listBySnapshotAndDataStoreRole(10L, DataStoreRole.Primary)).thenReturn(List.of(snapshotOnPrimaryStorage));
         Mockito.when(snapshotStoreDao.listBySnapshotAndDataStoreRole(10L, DataStoreRole.Image)).thenReturn(Collections.emptyList());
 
         storageManagerImpl.cleanupSnapshotRecordsInPrimaryStorageOnly(volume);
@@ -1757,10 +1757,10 @@ public void testCleanupSnapshotRecordsInPrimaryStorageOnlySkipsWhenSecondaryExis
         Mockito.when(snapshot.getState()).thenReturn(Snapshot.State.BackedUp);
         Mockito.when(snapshotDao.listByVolumeId(1L)).thenReturn(List.of(snapshot));
 
-        SnapshotDataStoreVO primaryRef = Mockito.mock(SnapshotDataStoreVO.class);
-        SnapshotDataStoreVO secondaryRef = Mockito.mock(SnapshotDataStoreVO.class);
-        Mockito.when(snapshotStoreDao.listBySnapshotAndDataStoreRole(10L, DataStoreRole.Primary)).thenReturn(List.of(primaryRef));
-        Mockito.when(snapshotStoreDao.listBySnapshotAndDataStoreRole(10L, DataStoreRole.Image)).thenReturn(List.of(secondaryRef));
+        SnapshotDataStoreVO snapshotOnPrimaryStorage = Mockito.mock(SnapshotDataStoreVO.class);
+        SnapshotDataStoreVO snapshotOnSecondaryStorage = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStoreDao.listBySnapshotAndDataStoreRole(10L, DataStoreRole.Primary)).thenReturn(List.of(snapshotOnPrimaryStorage));
+        Mockito.when(snapshotStoreDao.listBySnapshotAndDataStoreRole(10L, DataStoreRole.Image)).thenReturn(List.of(snapshotOnSecondaryStorage));
 
         storageManagerImpl.cleanupSnapshotRecordsInPrimaryStorageOnly(volume);