From 2c30101faf324404dbc0ad3368a1c424c88181ce Mon Sep 17 00:00:00 2001 From: Vishesh Date: Thu, 26 Oct 2023 13:47:20 +0530 Subject: [PATCH 1/2] Fixup updateSnapshotInfo failure due to forward merging --- .../java/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 7116359f9e4c..940860dd04d7 100755 --- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -570,7 +570,7 @@ private void updateSnapshotInfo(Long volumeId, Long vmSnapshotId, VMSnapshotVO v if ((storagePool.getPoolType() == StoragePoolType.NetworkFilesystem || storagePool.getPoolType() == StoragePoolType.Filesystem) && vmSnapshot.getType() == VMSnapshot.Type.Disk) { List vmSnapshotDetails = vmSnapshotDetailsDao.findDetails(vmSnapshotId, "kvmStorageSnapshot"); for (VMSnapshotDetailsVO vmSnapshotDetailsVO : vmSnapshotDetails) { - SnapshotInfo sInfo = snapshotDataFactory.getSnapshot(Long.parseLong(vmSnapshotDetailsVO.getValue()), DataStoreRole.Primary); + SnapshotInfo sInfo = snapshotDataFactory.getSnapshot(Long.parseLong(vmSnapshotDetailsVO.getValue()), storagePool.getId(), DataStoreRole.Primary); if (sInfo.getVolumeId() == volumeId) { snapshotOnPrimaryStore.setState(ObjectInDataStoreStateMachine.State.Ready); snapshotOnPrimaryStore.setInstallPath(sInfo.getPath()); From 618f9bfe7f16cf0c407358c9cbeaddcb6ccaa8c2 Mon Sep 17 00:00:00 2001 From: Vishesh Date: Thu, 26 Oct 2023 14:06:03 +0530 Subject: [PATCH 2/2] Fix test --- .../com/cloud/storage/snapshot/SnapshotManagerImplTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java b/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java index 1d7cf0a50d24..e6c2a0d0f3cf 100644 --- a/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java +++ b/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java @@ -74,7 +74,7 @@ public class SnapshotManagerImplTest { @Mock SnapshotService snapshotService; @Mock - SnapshotDataFactory snapshotDataFactory; + SnapshotDataFactory snapshotFactory; @Mock ResourceLimitService resourceLimitService; @Mock @@ -269,7 +269,7 @@ public void testCopyNewSnapshotToZones() { Mockito.when(store.getId()).thenReturn(storeId); Mockito.when(dataStoreManager.getDataStore(storeId, DataStoreRole.Image)).thenReturn(store); Mockito.when(snapshotStoreDao.listReadyBySnapshot(snapshotId, DataStoreRole.Image)).thenReturn(snapshotStoreList); - Mockito.when(snapshotDataFactory.getSnapshot(Mockito.anyLong(), Mockito.any())).thenReturn(Mockito.mock(SnapshotInfo.class)); + Mockito.when(snapshotFactory.getSnapshot(Mockito.anyLong(), Mockito.any())).thenReturn(Mockito.mock(SnapshotInfo.class)); CreateCmdResult result = Mockito.mock(CreateCmdResult.class); Mockito.when(result.isFailed()).thenReturn(false); Mockito.when(result.getPath()).thenReturn("SOMEPATH");