From 63593c50577170222e4026f4eac1adf6341e433a Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 15 Mar 2011 18:01:32 -0700
Subject: [PATCH] bug 8510: increment resource count for volume after it's
 created

---
 .../com/cloud/storage/StorageManagerImpl.java | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 72df4827439..60adf83fc80 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -493,9 +493,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
         createdVolume = _volsDao.findById(volumeId);
 
         if (success) {
-            // Increment the number of volumes
-            _accountMgr.incrementResourceCount(account.getId(), ResourceType.volume);
-
             createdVolume.setStatus(AsyncInstanceCreateStatus.Created);
             createdVolume.setPodId(pod.first().getId());
             createdVolume.setPoolId(pool.getId());
@@ -1546,6 +1543,9 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
         
         _usageEventDao.persist(usageEvent);
         
+        //Increment resource count during allocation; if actual creation fails, decrement it
+        _accountMgr.incrementResourceCount(volume.getAccountId(), ResourceType.volume);
+        
         return volume;
     }
 
@@ -1555,14 +1555,22 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
     public VolumeVO createVolume(CreateVolumeCmd cmd) {
         VolumeVO volume = _volsDao.findById(cmd.getEntityId());
 
-        if (cmd.getSnapshotId() != null) {
-            return createVolumeFromSnapshot(volume, cmd.getSnapshotId());
-        } else {
-            _accountMgr.incrementResourceCount(volume.getAccountId(), ResourceType.volume);
-            volume.setStatus(AsyncInstanceCreateStatus.Created);
-            _volsDao.update(volume.getId(), volume);
+        try {
+            if (cmd.getSnapshotId() != null) {
+                return createVolumeFromSnapshot(volume, cmd.getSnapshotId());
+            } else {
+                
+                volume.setStatus(AsyncInstanceCreateStatus.Created);
+                _volsDao.update(volume.getId(), volume);
+            }
+
+            return _volsDao.findById(volume.getId());
+        } finally {
+            if (volume.getStatus() !=  AsyncInstanceCreateStatus.Created) {
+                s_logger.trace("Decrementing volume resource count for account id=" + volume.getAccountId() + " as volume failed to create on the backend");
+                _accountMgr.decrementResourceCount(volume.getAccountId(), ResourceType.volume);
+            }
         }
-        return _volsDao.findById(volume.getId());
     }
 
     @Override