You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/03/10 12:19:54 UTC
git commit: updated refs/heads/master to 520d967
Repository: cloudstack
Updated Branches:
refs/heads/master 1fd401ff4 -> 520d96724
CLOUDSTACK-8312: The storage usage of "Primary Storage Allocated" is incorrect.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/520d9672
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/520d9672
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/520d9672
Branch: refs/heads/master
Commit: 520d96724ac437aa0a9ed391066f4f0879eaef7e
Parents: 1fd401f
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Tue Mar 10 16:17:10 2015 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Tue Mar 10 16:52:25 2015 +0530
----------------------------------------------------------------------
.../apache/cloudstack/storage/image/store/TemplateObject.java | 1 +
.../com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 2 ++
.../xenserver/resource/XenServerStorageProcessor.java | 2 ++
.../xenserver/resource/Xenserver625StorageProcessor.java | 2 ++
server/src/com/cloud/capacity/CapacityManagerImpl.java | 5 -----
5 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/520d9672/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
index e4b04de..6fa4aab 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
@@ -190,6 +190,7 @@ public class TemplateObject implements TemplateInfo {
TemplateObjectTO newTemplate = (TemplateObjectTO)cpyAnswer.getNewData();
VMTemplateStoragePoolVO templatePoolRef = templatePoolDao.findByPoolTemplate(getDataStore().getId(), getId());
templatePoolRef.setDownloadPercent(100);
+ templatePoolRef.setTemplateSize(newTemplate.getSize());
templatePoolRef.setDownloadState(Status.DOWNLOADED);
templatePoolRef.setLocalDownloadPath(newTemplate.getPath());
templatePoolRef.setInstallPath(newTemplate.getPath());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/520d9672/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 562cf5f..3b806e9 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -228,6 +228,7 @@ public class KVMStorageProcessor implements StorageProcessor {
if (destData.getObjectType() == DataObjectType.TEMPLATE) {
TemplateObjectTO newTemplate = new TemplateObjectTO();
newTemplate.setPath(primaryVol.getName());
+ newTemplate.setSize(primaryVol.getSize());
if (primaryPool.getType() == StoragePoolType.RBD) {
newTemplate.setFormat(ImageFormat.RAW);
} else {
@@ -237,6 +238,7 @@ public class KVMStorageProcessor implements StorageProcessor {
} else if (destData.getObjectType() == DataObjectType.VOLUME) {
VolumeObjectTO volumeObjectTO = new VolumeObjectTO();
volumeObjectTO.setPath(primaryVol.getName());
+ volumeObjectTO.setSize(primaryVol.getSize());
if (primaryVol.getFormat() == PhysicalDiskFormat.RAW)
volumeObjectTO.setFormat(ImageFormat.RAW);
else if (primaryVol.getFormat() == PhysicalDiskFormat.QCOW2) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/520d9672/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
index 9d483d7..f3cb419 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
@@ -850,6 +850,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
VDI tmplVdi = getVDIbyUuid(conn, tmplUuid);
final String uuidToReturn;
+ Long physicalSize = tmplVdi.getPhysicalUtilisation(conn);
if (managed) {
uuidToReturn = tmplUuid;
@@ -876,6 +877,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
newVol.setUuid(uuidToReturn);
newVol.setPath(uuidToReturn);
+ newVol.setSize(physicalSize);
newVol.setFormat(ImageFormat.VHD);
return new CopyCmdAnswer(newVol);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/520d9672/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
index 043514b..73c15fb 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
@@ -265,6 +265,7 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
VDI tmplVdi = Types.toVDI(task, conn);
final String uuidToReturn;
+ Long physicalSize = tmplVdi.getPhysicalUtilisation(conn);
if (managed) {
uuidToReturn = tmplVdi.getUuid(conn);
@@ -291,6 +292,7 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
newVol.setUuid(uuidToReturn);
newVol.setPath(uuidToReturn);
+ newVol.setSize(physicalSize);
newVol.setFormat(Storage.ImageFormat.VHD);
return new CopyCmdAnswer(newVol);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/520d9672/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 3c2851e..2eee865 100644
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -573,11 +573,6 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
totalAllocatedSize += templateSize + _extraBytesPerVolume;
}
- // Add the size for the templateForVmCreation if its not already present
- /*if ((templateForVmCreation != null) && !tmpinstalled) {
-
- }*/
-
return totalAllocatedSize;
}