cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [3/7] git commit: updated refs/heads/4.3 to 91ec548
Date Mon, 03 Feb 2014 00:24:35 GMT
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.
(cherry picked from commit 1ae02009b562692a7da54f2694a9962f55660aa3)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4809d91c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4809d91c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4809d91c

Branch: refs/heads/4.3
Commit: 4809d91c51ce682f3e18d85fb4e6318b27fac2a7
Parents: 9961a8e
Author: Koushik Das <koushik@apache.org>
Authored: Fri Jan 31 10:35:19 2014 +0530
Committer: Animesh Chaturvedi <animesh@apache.org>
Committed: Sun Feb 2 16:06:14 2014 -0800

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


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


Mime
View raw message