git commit: updated refs/heads/4.3-forward to 1ae0200

[ko...@apache.org]

Updated Branches:
  refs/heads/4.3-forward 713240bae -> 1ae02009b


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/1ae02009
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ae02009
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ae02009

Branch: refs/heads/4.3-forward
Commit: 1ae02009b562692a7da54f2694a9962f55660aa3
Parents: 713240b
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:35:19 2014 +0530

----------------------------------------------------------------------
 systemvm/scripts/_run.sh | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ae02009/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 $@