Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 69F1E17781 for ; Tue, 11 Nov 2014 12:03:42 +0000 (UTC) Received: (qmail 3269 invoked by uid 500); 11 Nov 2014 12:03:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 3082 invoked by uid 500); 11 Nov 2014 12:03:41 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 2687 invoked by uid 99); 11 Nov 2014 12:03:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Nov 2014 12:03:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B81EF9AC1D1; Tue, 11 Nov 2014 12:03:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Tue, 11 Nov 2014 12:03:49 -0000 Message-Id: <22b71f22665f4546aa18762173b51f6f@git.apache.org> In-Reply-To: <6ac3de36fd044948a206f950eda30755@git.apache.org> References: <6ac3de36fd044948a206f950eda30755@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] [abbrv] git commit: updated refs/heads/statscollector-graphite to e06a814 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/b1915f35 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b1915f35 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b1915f35 Branch: refs/heads/statscollector-graphite Commit: b1915f35f86ffd9101b043f8114fe15a061f5e35 Parents: 330bd27 Author: Mike Tutkowski Authored: Fri Nov 7 07:49:23 2014 -0700 Committer: Mike Tutkowski Committed: Fri Nov 7 07:49:53 2014 -0700 ---------------------------------------------------------------------- .../datastore/driver/ElastistorPrimaryDataStoreDriver.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1915f35/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java b/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java index 23db12d..770dcb9 100755 --- a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java +++ b/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java @@ -231,9 +231,6 @@ public class ElastistorPrimaryDataStoreDriver extends CloudStackPrimaryDataStore } if (result) { - - _volumeDao.deleteVolumesByInstance(volumeInfo.getId()); - long usedBytes = storagePool.getUsedBytes(); long capacityIops = storagePool.getCapacityIops();