Repository: cloudstack Updated Branches: refs/heads/hotfix/4.4-sf1 [created] 6602ad71a
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/6602ad71 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6602ad71 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6602ad71 Branch: refs/heads/hotfix/4.4-sf1 Commit: 6602ad71ac97fb1875131f41bb5f92ff1e3a1c7b Parents: cef29cc Author: Mike Tutkowski <[email protected]> Authored: Mon Nov 24 09:44:06 2014 -0700 Committer: Mike Tutkowski <[email protected]> Committed: Mon Nov 24 09:44:06 2014 -0700 ---------------------------------------------------------------------- .../storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6602ad71/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 e69534b..6a180ad 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 @@ -790,8 +790,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);
