CLOUDSTACK-3551: scaling up VM to service offering with 2gbram

Harikrishna Patnala · nitinmeh · commit b4662af0a93c · 2013-07-18T15:04:20.000+05:30
Fixed the type overflow of Ram value.
Signed off by : Nitin Mehta&lt;nitin.mehta@citrix.com&gt;
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java
@@ -109,7 +109,7 @@ public DeployDestination plan(VirtualMachineProfile<? extends VirtualMachine> vm
 		if (target == null) {
 			s_logger.warn("Cannot find host with tag " + hostTag + " use capacity from service offering");
 			cpu_requested = offering.getCpu() * offering.getSpeed();
-			ram_requested = offering.getRamSize() * 1024 * 1024;
+			ram_requested = offering.getRamSize() * 1024L * 1024L;
 		} else {
 			cpu_requested = target.getCpus() * target.getSpeed().intValue();
 			ram_requested = target.getTotalMemory();
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -485,7 +485,7 @@ private long getVMSnapshotAllocatedCapacity(StoragePoolVO pool){
                 if(_vmSnapshotDao.listByParent(vmSnapshotVO.getId()).size() == 0)
                     pathCount++;
                 if(vmSnapshotVO.getType() == VMSnapshot.Type.DiskAndMemory)
-                    memorySnapshotSize += (offering.getRamSize() * 1024 * 1024);
+                    memorySnapshotSize += (offering.getRamSize() * 1024L * 1024L);
             }
             if(pathCount <= 1)
                 totalSize = totalSize + memorySnapshotSize;
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3363,7 +3363,7 @@ public VMInstanceVO reConfigureVm(VMInstanceVO vm , ServiceOffering oldServiceOf
         Float cpuOvercommitRatio = Float.parseFloat(_configServer.getConfigValue(Config.CPUOverprovisioningFactor.key(), Config.ConfigurationParameterScope.cluster.toString(), hostVo.getClusterId()));
         long minMemory = (long) (newServiceOffering.getRamSize()/memoryOvercommitRatio);
         ScaleVmCommand reconfigureCmd = new ScaleVmCommand(vm.getInstanceName(), newServiceOffering.getCpu(),
-                (int) (newServiceOffering.getSpeed()/cpuOvercommitRatio), newServiceOffering.getSpeed(), minMemory * 1024 * 1024, newServiceOffering.getRamSize() * 1024 * 1024, newServiceOffering.getLimitCpuUse(), isDynamicallyScalable);
+                (int) (newServiceOffering.getSpeed()/cpuOvercommitRatio), newServiceOffering.getSpeed(), minMemory * 1024L * 1024L, newServiceOffering.getRamSize() * 1024L * 1024L, newServiceOffering.getLimitCpuUse(), isDynamicallyScalable);
 
         Long dstHostId = vm.getHostId();
         ItWorkVO work = new ItWorkVO(UUID.randomUUID().toString(), _nodeId, State.Running, vm.getType(), vm.getId());

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ private long getVMSnapshotAllocatedCapacity(StoragePoolVO pool){`
`485`	`485`	`if(_vmSnapshotDao.listByParent(vmSnapshotVO.getId()).size() == 0)`
`486`	`486`	`pathCount++;`
`487`	`487`	`if(vmSnapshotVO.getType() == VMSnapshot.Type.DiskAndMemory)`
`488`		`- memorySnapshotSize += (offering.getRamSize() * 1024 * 1024);`
	`488`	`+ memorySnapshotSize += (offering.getRamSize() * 1024L * 1024L);`
`489`	`489`	`}`
`490`	`490`	`if(pathCount <= 1)`
`491`	`491`	`totalSize = totalSize + memorySnapshotSize;`