Updated Branches: refs/heads/master-6-17-stable 3c214aba9 -> ad33e6d47
CLOUDSTACK-2181: Scale down is allowed when one resource(say cpu) is being scale up and other resource (say ram) is being scale down ;but not allowed when both resources are being scaledown Signed off by : Nitin Mehta<[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad33e6d4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad33e6d4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad33e6d4 Branch: refs/heads/master-6-17-stable Commit: ad33e6d475adf1abf45e3d983aaaba71460f1c3b Parents: 3c214ab Author: Harikrishna Patnala <[email protected]> Authored: Mon Jun 24 12:09:44 2013 +0530 Committer: Nitin Mehta <[email protected]> Committed: Mon Jun 24 20:00:44 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad33e6d4/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 e8ea024..4be6c18 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1161,9 +1161,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use int currentMemory = currentServiceOffering.getRamSize(); int currentSpeed = currentServiceOffering.getSpeed(); - if(newSpeed <= currentSpeed - && newMemory <= currentMemory - && newCpu <= currentCpu){ + // Don't allow to scale when (Any of the new values less than current values) OR (All current and new values are same) + if( (newSpeed < currentSpeed || newMemory < currentMemory || newCpu < currentCpu) + || ( newSpeed == currentSpeed && newMemory == currentMemory && newCpu == currentCpu)){ throw new InvalidParameterValueException("Only scaling up the vm is supported, new service offering should have both cpu and memory greater than the old values"); }
