Fix: copy of volumes are not being properly expunged when a volume migration fails.

victor-mendes-eduardo · victor-mendes-eduardo · commit a8544ee34387 · 2015-08-04T16:07:27.000-03:00
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -1009,6 +1009,12 @@ protected Void copyVolumeCallBack(AsyncCallbackDispatcher<VolumeServiceImpl, Cop
                 destVolume.processEvent(Event.OperationFailed);
                 srcVolume.processEvent(Event.OperationFailed);
                 destroyVolume(destVolume.getId());
+
+                //Release volume from its original pod so it can be expunged
+                VolumeVO volumeVO = volDao.findById(destVolume.getId());
+                volumeVO.setPodId(null);
+                volDao.persist(volumeVO);
+
                 destVolume = volFactory.getVolume(destVolume.getId());
                 AsyncCallFuture<VolumeApiResult> destroyFuture = expungeVolumeAsync(destVolume);
                 destroyFuture.get();
