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/17e8d9e2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17e8d9e2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17e8d9e2
Branch: refs/heads/statscollector-graphite Commit: 17e8d9e2be87c56a659cd6a21fb321d8b6f36301 Parents: f506f7c Author: Mike Tutkowski <mike.tutkow...@solidfire.com> Authored: Thu Nov 6 22:58:35 2014 -0700 Committer: Mike Tutkowski <mike.tutkow...@solidfire.com> Committed: Thu Nov 6 22:58:35 2014 -0700 ---------------------------------------------------------------------- .../storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17e8d9e2/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 d61258b..dcbabe6 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 @@ -413,8 +413,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
