You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mi...@apache.org on 2015/05/23 19:39:30 UTC
git commit: updated refs/heads/master to 87d4086
Repository: cloudstack
Updated Branches:
refs/heads/master d7854791b -> 87d4086a6
CLOUDSTACK-6181 Specify GB for the value of rootdisksize parameter. Add some Bytes/GB for log or exception messages. Fix Gb->GB.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/87d4086a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/87d4086a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/87d4086a
Branch: refs/heads/master
Commit: 87d4086a64a6ebf387bda03509e0c03dac685cae
Parents: d785479
Author: Milamber <mi...@apache.org>
Authored: Sat May 23 16:58:05 2015 +0100
Committer: Milamber <mi...@apache.org>
Committed: Sat May 23 17:52:21 2015 +0100
----------------------------------------------------------------------
.../apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +-
.../cloudstack/engine/orchestration/VolumeOrchestrator.java | 8 ++++----
server/src/com/cloud/vm/UserVmManagerImpl.java | 4 +++-
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87d4086a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 3d13d6b..f17c1c1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -121,7 +121,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
@Parameter(name = ApiConstants.ROOT_DISK_SIZE,
type = CommandType.LONG,
- description = "Optional field to resize root disk on deploy. Only applies to template-based deployments. Analogous to details[0].rootdisksize, which takes precedence over this parameter if both are provided",
+ description = "Optional field to resize root disk on deploy. Value is in GB. Only applies to template-based deployments. Analogous to details[0].rootdisksize, which takes precedence over this parameter if both are provided",
since = "4.4")
private Long rootdisksize;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87d4086a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 884da25..d407bb1 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -599,9 +599,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
@Override
public boolean validateVolumeSizeRange(long size) {
if (size < 0 || (size > 0 && size < (1024 * 1024 * 1024))) {
- throw new InvalidParameterValueException("Please specify a size of at least 1 Gb.");
+ throw new InvalidParameterValueException("Please specify a size of at least 1 GB.");
} else if (size > (MaxVolumeSize.value() * 1024 * 1024 * 1024)) {
- throw new InvalidParameterValueException("volume size " + size + ", but the maximum size allowed is " + MaxVolumeSize + " Gb.");
+ throw new InvalidParameterValueException("volume size " + size + ", but the maximum size allowed is " + MaxVolumeSize + " GB.");
}
return true;
@@ -674,10 +674,10 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
if (rootDisksize != null ) {
rootDisksize = rootDisksize * 1024 * 1024 * 1024;
if (rootDisksize > size) {
- s_logger.debug("Using root disk size of " + rootDisksize + " for volume " + name);
+ s_logger.debug("Using root disk size of " + rootDisksize + " Bytes for volume " + name);
size = rootDisksize;
} else {
- s_logger.debug("Using root disk size of " + size + " for volume " + name + "since specified root disk size of " + rootDisksize + " is smaller than template");
+ s_logger.debug("Using root disk size of " + size + " Bytes for volume " + name + "since specified root disk size of " + rootDisksize + " Bytes is smaller than template");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87d4086a/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 4b043a3..a413d11 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3095,7 +3095,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
if ((rootDiskSize << 30) < templateVO.getSize()) {
- throw new InvalidParameterValueException("unsupported: rootdisksize override is smaller than template size " + templateVO.getSize());
+ Long templateVOSizeGB = templateVO.getSize() / 1024 / 1024 / 1024;
+ throw new InvalidParameterValueException("unsupported: rootdisksize override is smaller than template size " + templateVO.getSize()
+ + "B (" + templateVOSizeGB + "GB)");
} else {
s_logger.debug("rootdisksize of " + (rootDiskSize << 30) + " was larger than template size of " + templateVO.getSize());
}