From f7fdc8a97450fee42e6648960158220aa9ca17b0 Mon Sep 17 00:00:00 2001
From: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com>
Date: Sat, 17 Jul 2021 12:01:54 +0530
Subject: [PATCH] Do remove volume only on expunge (#5213)

---
 .../src/main/java/com/cloud/storage/VolumeApiServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index f77a007e120..8d679502727 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1555,9 +1555,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
                 s_logger.warn("Failed to expunge volume: " + volumeId);
                 return null;
             }
+            removeVolume(volume.getId());
         }
 
-        removeVolume(volume.getId());
         return volume;
     }