CSTACKEX-306: cloned cloudstack volume should be deleted if subseuqent resize fails

Author: rajiv-jain-netapp

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -354,7 +354,8 @@ private CloudStackVolume cloneCloudStackVolumeFromTemplate(StoragePoolVO storage
         if (requestedSize > templatePoolRef.getTemplateSize()) {
             logger.info("cloneCloudStackVolumeFromTemplate: Growing clone of template [{}] from {} to {} bytes for volume [{}]",
                     templateId, templatePoolRef.getTemplateSize(), requestedSize, volumeInfo.getId());
-            storageStrategy.resizeCloudStackVolume(cloned, requestedSize);
+            resizeClonedVolumeOrCleanup(storageStrategy, cloned, requestedSize,
+                    "cloneCloudStackVolumeFromTemplate template [" + templateId + "] volume [" + volumeInfo.getId() + "]");
         }
 
         return cloned;
@@ -449,12 +450,38 @@ private CloudStackVolume cloneCloudStackVolumeFromSnapshot(StoragePoolVO storage
         if (snapshotSize > 0 && requestedSize > snapshotSize) {
             logger.info("cloneCloudStackVolumeFromSnapshot: Growing clone of snapshot [{}] from {} to {} bytes for volume [{}]",
                     csSnapshotId, snapshotSize, requestedSize, volumeInfo.getId());
-            storageStrategy.resizeCloudStackVolume(cloned, requestedSize);
+            resizeClonedVolumeOrCleanup(storageStrategy, cloned, requestedSize,
+                    "cloneCloudStackVolumeFromSnapshot snapshot [" + csSnapshotId + "] volume [" + volumeInfo.getId() + "]");
         }
 
         return cloned;
     }
 
+    /**
+     * Grows a just-created ONTAP clone to the requested size. If resize fails, deletes the clone
+     * so the CloudStack create-failure path does not leave an orphaned LUN/file on the array.
+     */
+    private void resizeClonedVolumeOrCleanup(StorageStrategy storageStrategy, CloudStackVolume cloned,
+                                             long requestedSize, String context) {
+        try {
+            storageStrategy.resizeCloudStackVolume(cloned, requestedSize);
+        } catch (RuntimeException resizeEx) {
+            logger.error("{}: Resize to {} bytes failed; deleting orphaned ONTAP clone: {}",
+                    context, requestedSize, resizeEx.getMessage());
+            bestEffortDeleteOrphanedClone(storageStrategy, cloned);
+            throw resizeEx;
+        }
+    }
+
+    private void bestEffortDeleteOrphanedClone(StorageStrategy storageStrategy, CloudStackVolume cloned) {
+        try {
+            storageStrategy.deleteCloudStackVolume(cloned);
+            logger.info("Deleted orphaned ONTAP clone after resize failure");
+        } catch (Exception cleanupEx) {
+            logger.warn("Failed to delete orphaned ONTAP clone after resize failure: {}", cleanupEx.getMessage());
+        }
+    }
+
     private String requireSnapshotDetail(long csSnapshotId, String key) {
         String value = getSnapshotDetail(csSnapshotId, key);
         if (value == null || value.isEmpty()) {

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriverTest.java

@@ -1025,6 +1025,33 @@ void testCreateAsync_VolumeClonedFromSnapshot_GrowsWhenOfferingIsLarger() {
         }
     }
 
+    @Test
+    void testCreateAsync_VolumeClonedFromSnapshot_ResizeFails_DeletesOrphanedClone() {
+        stubVolumeCloneFromSnapshot(5368709120L, 21474836480L, ProtocolType.ISCSI.name());
+
+        Lun clonedLun = new Lun();
+        clonedLun.setName("/vol/vol1/test_volume");
+        clonedLun.setUuid("snap-cloned-lun-uuid");
+        CloudStackVolume cloned = new CloudStackVolume();
+        cloned.setLun(clonedLun);
+
+        try (MockedStatic<OntapStorageUtils> utilityMock = mockStatic(OntapStorageUtils.class, CALLS_REAL_METHODS)) {
+            utilityMock.when(() -> OntapStorageUtils.getStrategyByStoragePoolDetails(any())).thenReturn(sanStrategy);
+            when(sanStrategy.cloneCloudStackVolume(any())).thenReturn(cloned);
+            doThrow(new CloudRuntimeException("resize failed"))
+                    .when(sanStrategy).resizeCloudStackVolume(eq(cloned), eq(21474836480L));
+            doNothing().when(sanStrategy).deleteCloudStackVolume(eq(cloned));
+
+            driver.createAsync(dataStore, volumeInfo, createCallback);
+
+            ArgumentCaptor<CreateCmdResult> resultCaptor = ArgumentCaptor.forClass(CreateCmdResult.class);
+            verify(createCallback).complete(resultCaptor.capture());
+            assertFalse(resultCaptor.getValue().isSuccess());
+            verify(sanStrategy).deleteCloudStackVolume(eq(cloned));
+            verify(volumeDetailsDao, never()).addDetail(eq(100L), eq(OntapStorageConstants.LUN_DOT_UUID), anyString(), anyBoolean());
+        }
+    }
+
     @Test
     void testCreateAsync_VolumeClonedFromSnapshot_NfsSuccess() {
         stubVolumeCloneFromSnapshot(5368709120L, 5368709120L, ProtocolType.NFS3.name());