Reconcile: cleanup volumes with empty path in Creating and Migrating state if reconcile is not applicable

Author: weizhouapache

framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java

@@ -73,6 +73,7 @@
 import com.cloud.storage.Snapshot;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
 import com.cloud.storage.VolumeDetailVO;
 import com.cloud.storage.dao.SnapshotDao;
 import com.cloud.storage.dao.SnapshotDetailsDao;
@@ -1199,10 +1200,20 @@ private boolean cleanupVolume(final long volumeId) {
             return true;
         }
         if (vol.getState().isTransitional()) {
-            if (Volume.State.Migrating.equals(vol.getState()) && Arrays.asList(ImageFormat.RAW, ImageFormat.QCOW2).contains(vol.getFormat())
-                    && ReconcileCommandService.ReconcileCommandsEnabled.value()) {
-                logger.debug("Skipping cleaning up Migrating volume: " + vol);
-                return true;
+            if (Volume.State.Migrating.equals(vol.getState())) {
+                VolumeVO destVolume = _volsDao.findByLastIdAndState(vol.getId(), Volume.State.Creating);
+                if (destVolume != null && destVolume.getPath() == null) {
+                    cleanupVolume(destVolume.getId());
+                } else if (Arrays.asList(ImageFormat.RAW, ImageFormat.QCOW2).contains(vol.getFormat())
+                        && ReconcileCommandService.ReconcileCommandsEnabled.value()) {
+                    logger.debug("Skipping cleaning up Migrating volume: " + vol);
+                    return true;
+                } else {
+                    destVolume = _volsDao.findByLastIdAndState(vol.getId(), Volume.State.Migrating);
+                    if (destVolume != null) {
+                        cleanupVolume(destVolume.getId());
+                    }
+                }
             }
             logger.debug("Cleaning up volume with Id: " + volumeId);
             boolean status = vol.stateTransit(Volume.Event.OperationFailed);