Launch RESIZE event on volume snapshot revert (apache#10482)

Co-authored-by: Julien Hervot de Mattos Vaz <[email protected]>
Co-authored-by: dahn <[email protected]>

Author: 3 people

server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java

@@ -390,15 +390,27 @@ public Snapshot revertSnapshot(Long snapshotId) {
 
         boolean result = snapshotStrategy.revertSnapshot(snapshotInfo);
         if (result) {
-            // update volume size and primary storage count
-            _resourceLimitMgr.decrementResourceCount(snapshot.getAccountId(), ResourceType.primary_storage, volume.getSize() - snapshot.getSize());
-            volume.setSize(snapshot.getSize());
-            _volsDao.update(volume.getId(), volume);
+            updateVolumeSizeAndPrimaryStorageCount(volume, snapshot);
             return snapshotInfo;
         }
         return null;
     }
 
+    public void updateVolumeSizeAndPrimaryStorageCount(VolumeVO volume, SnapshotVO snapshot) {
+        Long differenceBetweenVolumeAndSnapshotSize = new Long(volume.getSize() - snapshot.getSize());
+        if (differenceBetweenVolumeAndSnapshotSize != 0) {
+            if (differenceBetweenVolumeAndSnapshotSize > 0) {
+                _resourceLimitMgr.decrementResourceCount(snapshot.getAccountId(), ResourceType.primary_storage, differenceBetweenVolumeAndSnapshotSize);
+            } else if (differenceBetweenVolumeAndSnapshotSize < 0) {
+                _resourceLimitMgr.incrementResourceCount(snapshot.getAccountId(), ResourceType.primary_storage, differenceBetweenVolumeAndSnapshotSize * -1L);
+            }
+            volume.setSize(snapshot.getSize());
+            _volsDao.update(volume.getId(), volume);
+            UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_RESIZE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(),
+                    volume.getDiskOfferingId(), volume.getTemplateId(), volume.getSize(), Volume.class.getName(), volume.getUuid());
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_SNAPSHOT_POLICY_UPDATE, eventDescription = "updating snapshot policy", async = true)
     public SnapshotPolicy updateSnapshotPolicy(UpdateSnapshotPolicyCmd cmd) {
@@ -812,7 +824,7 @@ public boolean deleteSnapshot(long snapshotId, Long zoneId) {
 
             return result;
         } catch (Exception e) {
-            logger.debug("Failed to delete snapshot {}:{}", snapshotCheck, e.toString());
+            logger.debug("Failed to delete snapshot {}:{}", snapshotCheck.getId(), e.toString());
 
             throw new CloudRuntimeException("Failed to delete snapshot:" + e.toString());
         }

server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerTest.java

@@ -235,7 +235,6 @@ public void setup() throws ResourceAllocationException {
 
         doNothing().when(_resourceLimitMgr).checkResourceLimit(any(Account.class), any(ResourceType.class));
         doNothing().when(_resourceLimitMgr).checkResourceLimit(any(Account.class), any(ResourceType.class), anyLong());
-        doNothing().when(_resourceLimitMgr).decrementResourceCount(anyLong(), any(ResourceType.class), anyLong());
         doNothing().when(_resourceLimitMgr).incrementResourceCount(anyLong(), any(ResourceType.class));
         doNothing().when(_resourceLimitMgr).incrementResourceCount(anyLong(), any(ResourceType.class), anyLong());
 
@@ -352,7 +351,6 @@ public void testRevertSnapshotF3() {
         when(_vmDao.findById(anyLong())).thenReturn(vmMock);
         when(vmMock.getState()).thenReturn(State.Stopped);
         when (snapshotStrategy.revertSnapshot(any(SnapshotInfo.class))).thenReturn(true);
-        when(_volumeDao.update(anyLong(), any(VolumeVO.class))).thenReturn(true);
         doReturn(DataStoreRole.Image).when(snapshotHelperMock).getDataStoreRole(any());
         Snapshot snapshot = _snapshotMgr.revertSnapshot(TEST_SNAPSHOT_ID);
         Assert.assertNotNull(snapshot);

utils/src/test/java/com/cloud/utils/UriUtilsTest.java

@@ -276,8 +276,8 @@ public void testIsUrlForCompressedFile() {
 
     @Test
     public void validateUrl() {
-        Pair<String, Integer> url1 = UriUtils.validateUrl("https://www.cloudstack.org");
-        Assert.assertEquals(url1.first(), "www.cloudstack.org");
+        Pair<String, Integer> url1 = UriUtils.validateUrl("https://cloudstack.apache.org/");
+        Assert.assertEquals(url1.first(), "cloudstack.apache.org");
 
         Pair<String, Integer> url2 = UriUtils.validateUrl("https://www.apache.org");
         Assert.assertEquals(url2.first(), "www.apache.org");