Repository: cloudstack Updated Branches: refs/heads/hotfix/4.4/CLOUDSTACK-7883 [created] c58546158
CLOUDSTACK-7883: 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/c5854615 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5854615 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5854615 Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7883 Commit: c58546158e2c69158364df9a0caf18ec437687b5 Parents: 70cfbd3 Author: Mike Tutkowski <mike.tutkow...@solidfire.com> Authored: Tue Nov 11 08:59:06 2014 -0700 Committer: Mike Tutkowski <mike.tutkow...@solidfire.com> Committed: Tue Nov 11 08:59:06 2014 -0700 ---------------------------------------------------------------------- .../storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5854615/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 014413d..94ae0da 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 @@ -785,8 +785,6 @@ public class SolidfirePrimaryDataStoreDriver implements PrimaryDataStoreDriver { SolidFireUtil.SolidFireVolume sfVolume = deleteSolidFireVolume(volumeInfo, sfConnection); - _volumeDao.deleteVolumesByInstance(volumeInfo.getId()); - // if (!sfAccountHasVolume(sfAccountId, sfConnection)) { // // delete the account from the SolidFire SAN // deleteSolidFireAccount(sfAccountId, sfConnection);
