You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2014/01/31 06:21:41 UTC
[1/2] git commit: updated refs/heads/master to 580ebb0
Updated Branches:
refs/heads/master 836a9caa7 -> 580ebb001
CLOUDSTACK-5993: Cloud agent fails to start on 32-bit system vms (cpvm and ssvm) created with 4GB RAM offering
Capped the max heap size of the JVM at 2600M for 32-bit system VMs. For 64-bit, existing logic works fine.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2f605df
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2f605df
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2f605df
Branch: refs/heads/master
Commit: f2f605dfda5b731246ab932936e164b0fa94089c
Parents: 836a9ca
Author: Koushik Das <ko...@apache.org>
Authored: Fri Jan 31 10:35:19 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Fri Jan 31 10:39:30 2014 +0530
----------------------------------------------------------------------
systemvm/scripts/_run.sh | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2f605df/systemvm/scripts/_run.sh
----------------------------------------------------------------------
diff --git a/systemvm/scripts/_run.sh b/systemvm/scripts/_run.sh
index bd06346..1a37c7d 100755
--- a/systemvm/scripts/_run.sh
+++ b/systemvm/scripts/_run.sh
@@ -61,4 +61,11 @@ then
maxmem=$eightypcnt
fi
+if [ "$(uname -m | grep '64')" == "" ]; then
+ let "maxmem32bit=2600"
+ if [ $maxmem -gt $maxmem32bit ]; then
+ maxmem=$maxmem32bit
+ fi
+fi
+
java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@
[2/2] git commit: updated refs/heads/master to 580ebb0
Posted by ko...@apache.org.
CLOUDSTACK-5989: Trying to start a vm while 'vm snapshot' is in progress results in inconsistency
The fix is to fail the start operation if a vm snapshot is in progress
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/580ebb00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/580ebb00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/580ebb00
Branch: refs/heads/master
Commit: 580ebb0010cbebcb13fefd8bd96137b7033ef872
Parents: f2f605d
Author: Koushik Das <ko...@apache.org>
Authored: Thu Jan 30 18:07:24 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Fri Jan 31 10:39:43 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/580ebb00/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index b712528..f3e3c36 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1525,6 +1525,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
protected boolean stateTransitTo(VMInstanceVO vm, VirtualMachine.Event e, Long hostId, String reservationId) throws NoTransitionException {
+ // if there are active vm snapshots task, state change is not allowed
+ if (_vmSnapshotMgr.hasActiveVMSnapshotTasks(vm.getId())) {
+ s_logger.error("State transit with event: " + e + " failed due to: " + vm.getInstanceName() + " has active VM snapshots tasks");
+ return false;
+ }
vm.setReservationId(reservationId);
return _stateMachine.transitTo(vm, e, new Pair<Long, Long>(vm.getHostId(), hostId), _vmDao);
}