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 2015/03/11 08:52:46 UTC
[1/3] git commit: updated refs/heads/4.5 to 7d2ffe0
Repository: cloudstack
Updated Branches:
refs/heads/4.5 290938b08 -> 7d2ffe063
CLOUDSTACK-8312: The storage usage of "Primary Storage Allocated" is incorrect.
(cherry picked from commit 520d96724ac437aa0a9ed391066f4f0879eaef7e)
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/5aedeb74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5aedeb74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5aedeb74
Branch: refs/heads/4.5
Commit: 5aedeb74f98a24f41e4740d41a9d3a74925846b4
Parents: 290938b
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Tue Mar 10 16:17:10 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Mar 11 13:07:47 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/5aedeb74/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 7288d45..d0577f4 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/5aedeb74/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 5752d57..ebbb3d3 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
@@ -219,6 +219,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 {
@@ -228,6 +229,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/5aedeb74/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 2a1ee1b..415f853 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
@@ -816,6 +816,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
VDI tmplVdi = getVDIbyUuid(conn, tmplUuid);
final String uuidToReturn;
+ Long physicalSize = tmplVdi.getPhysicalUtilisation(conn);
if (managed) {
uuidToReturn = tmplUuid;
@@ -842,6 +843,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/5aedeb74/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 eec01db..a8fe53a 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
@@ -236,6 +236,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);
@@ -262,6 +263,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/5aedeb74/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 af66b15..3c49099 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -576,11 +576,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;
}
[3/3] git commit: updated refs/heads/4.5 to 7d2ffe0
Posted by bh...@apache.org.
systemvms: use Debian http redirector for apt repos
Picked in parts from https://github.com/apache/cloudstack/pull/103/files
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/7d2ffe06
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d2ffe06
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d2ffe06
Branch: refs/heads/4.5
Commit: 7d2ffe063d849d77600a458fcb3a358c5d61d737
Parents: a04dd71
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Mar 11 13:22:09 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Mar 11 13:22:09 2015 +0530
----------------------------------------------------------------------
tools/appliance/definitions/systemvm64template/postinstall.sh | 2 +-
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d2ffe06/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index 90ff6fd..1a701ae 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -23,7 +23,7 @@ CLOUDSTACK_RELEASE=4.5.0
add_backports () {
sed -i '/backports/d' /etc/apt/sources.list
- echo 'deb http://http.us.debian.org/debian wheezy-backports main' >> /etc/apt/sources.list
+ echo 'deb http://http.debian.net/debian/ wheezy-backports main' >> /etc/apt/sources.list
apt-get update
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d2ffe06/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 91ec107..aa6a1c0 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -23,7 +23,7 @@ CLOUDSTACK_RELEASE=4.5.0
add_backports () {
sed -i '/backports/d' /etc/apt/sources.list
- echo 'deb http://http.us.debian.org/debian wheezy-backports main' >> /etc/apt/sources.list
+ echo 'deb http://http.debian.net/debian/ wheezy-backports main' >> /etc/apt/sources.list
apt-get update
}
[2/3] git commit: updated refs/heads/4.5 to 7d2ffe0
Posted by bh...@apache.org.
CLOUDSTACK-8304: disable snapshots from non-snapshot repositories
Signed-off-by: Laszlo Hornyak <la...@gmail.com>
Signed-off-by: Rajani Karuturi <ra...@gmail.com>
This closes #100
(cherry picked from commit 9a38b2f7de79888cdbbb2dca2305d6ec10f81ee0)
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/a04dd716
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a04dd716
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a04dd716
Branch: refs/heads/4.5
Commit: a04dd7162ef7f4287b8573d60c301ac54861f3ff
Parents: 5aedeb7
Author: Laszlo Hornyak <la...@gmail.com>
Authored: Fri Mar 6 17:41:32 2015 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Mar 11 13:08:00 2015 +0530
----------------------------------------------------------------------
plugins/hypervisors/kvm/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a04dd716/plugins/hypervisors/kvm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index c6858f7..f4fb2c4 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -22,10 +22,16 @@
<repository>
<id>libvirt-org</id>
<url>http://libvirt.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>ceph-com</id>
<url>http://ceph.com/maven</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
<dependencies>