CLOUDSTACK-8964: Can't create volume from snapshot of a removed volume

ustcweizhou · ustcweizhou · commit bef92052ee9a · 2015-10-23T22:02:59.000+02:00
This issue happens on KVM as well.
This is because the volume info is missing in the CopyCommand once the volume has been removed.
When the KVM agent tries to process the command, it will throws a NPE.
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
@@ -77,7 +77,7 @@ public VolumeInfo getVolume(long volumeId, DataStoreRole storeRole) {
 
     @Override
     public VolumeInfo getVolume(long volumeId) {
-        VolumeVO volumeVO = volumeDao.findById(volumeId);
+        VolumeVO volumeVO = volumeDao.findByIdIncludingRemoved(volumeId);
         if (volumeVO == null) {
             return null;
         }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public VolumeInfo getVolume(long volumeId, DataStoreRole storeRole) {`
`77`	`77`
`78`	`78`	`@Override`
`79`	`79`	`public VolumeInfo getVolume(long volumeId) {`
`80`		`- VolumeVO volumeVO = volumeDao.findById(volumeId);`
	`80`	`+ VolumeVO volumeVO = volumeDao.findByIdIncludingRemoved(volumeId);`
`81`	`81`	`if (volumeVO == null) {`
`82`	`82`	`return null;`
`83`	`83`	`}`