cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 7d73e9b
Date Sun, 25 Oct 2015 20:26:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master b69dff790 -> 7d73e9bfa


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

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.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bef92052
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bef92052
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bef92052

Branch: refs/heads/master
Commit: bef92052ee9a7303b427782838a8a97623de231c
Parents: ecc2e2f
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Mon Oct 19 20:49:28 2015 +0200
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Fri Oct 23 22:02:59 2015 +0200

----------------------------------------------------------------------
 .../apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bef92052/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
----------------------------------------------------------------------
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
index bc51f5f..3e4cdff 100644
--- 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 class VolumeDataFactoryImpl implements VolumeDataFactory {
 
     @Override
     public VolumeInfo getVolume(long volumeId) {
-        VolumeVO volumeVO = volumeDao.findById(volumeId);
+        VolumeVO volumeVO = volumeDao.findByIdIncludingRemoved(volumeId);
         if (volumeVO == null) {
             return null;
         }


Mime
View raw message