You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/12/10 14:56:59 UTC
git commit: updated refs/heads/4.3 to f189c10
Repository: cloudstack
Updated Branches:
refs/heads/4.3 63298d9b7 -> f189c105d
CLOUDSTACK-8014: Fix NPE searching including removed templates
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE
Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f189c105
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f189c105
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f189c105
Branch: refs/heads/4.3
Commit: f189c105d8dde5491697b171b969e757f8f15858
Parents: 63298d9
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Dec 10 19:08:26 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Dec 10 19:13:30 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/storage/StorageManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f189c105/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 385b478..bafea86 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1570,8 +1570,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
long totalAskingSize = 0;
for (Volume volume : volumes) {
if (volume.getTemplateId() != null) {
- VMTemplateVO tmpl = _templateDao.findById(volume.getTemplateId());
- if (tmpl.getFormat() != ImageFormat.ISO) {
+ VMTemplateVO tmpl = _templateDao.findByIdIncludingRemoved(volume.getTemplateId());
+ if (tmpl != null && tmpl.getFormat() != ImageFormat.ISO) {
allocatedSizeWithtemplate = _capacityMgr.getAllocatedPoolCapacity(poolVO, tmpl);
}
}