Allow infrastructure to handle delete of volume from DB
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c5bc4ae Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c5bc4ae Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c5bc4ae Branch: refs/heads/statscollector-graphite Commit: 7c5bc4ae7eedeb3a7f3bf96362107c39064ca103 Parents: 9338abb Author: Mike Tutkowski <mike.tutkow...@solidfire.com> Authored: Thu Nov 6 21:34:05 2014 -0700 Committer: Mike Tutkowski <mike.tutkow...@solidfire.com> Committed: Thu Nov 6 22:54:20 2014 -0700 ---------------------------------------------------------------------- .../storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c5bc4ae/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java index f66b5a1..008693c 100644 --- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java +++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java @@ -465,8 +465,6 @@ public class SolidFirePrimaryDataStoreDriver implements PrimaryDataStoreDriver { _volumeDetailsDao.removeDetails(volumeId); - _volumeDao.deleteVolumesByInstance(volumeId); - StoragePoolVO storagePool = _storagePoolDao.findById(storagePoolId); // getUsedBytes(StoragePool) will not include the volume to delete because it has already been deleted by this point
