You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/25 13:36:32 UTC
[1/2] git commit: updated refs/heads/4.3 to bb81082
Repository: cloudstack
Updated Branches:
refs/heads/4.3 712f8054d -> bb81082e5
CLOUDSTACK-7951
Limit amount of memory used by cloudstack-agent jsvc.
Signed-off-by: Edison Su <su...@gmail.com>
(cherry picked from commit 7884c750a205fa8962de4ac65960a9f514770817)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/20de43fd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/20de43fd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/20de43fd
Branch: refs/heads/4.3
Commit: 20de43fd792390d3ee57a3006d937413931ee371
Parents: 712f805
Author: Keiichi Yusa <ke...@aist.go.jp>
Authored: Thu Nov 20 17:16:01 2014 +0900
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 17:45:59 2014 +0530
----------------------------------------------------------------------
packaging/centos63/cloud-agent.rc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20de43fd/packaging/centos63/cloud-agent.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
index ab49524..e9b203e 100755
--- a/packaging/centos63/cloud-agent.rc
+++ b/packaging/centos63/cloud-agent.rc
@@ -66,7 +66,7 @@ export CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:$PCP:/etc/cloudstack/a
start() {
echo -n $"Starting $PROGNAME: "
if hostname --fqdn >/dev/null 2>&1 ; then
- $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" \
+ $JSVC -Xms1024m -Xmx2048m -cp "$CLASSPATH" -pidfile "$PIDFILE" \
-errfile $LOGDIR/cloudstack-agent.err -outfile $LOGDIR/cloudstack-agent.out $CLASS
RETVAL=$?
echo
[2/2] git commit: updated refs/heads/4.3 to bb81082
Posted by bh...@apache.org.
CLOUDSTACK-7951: Limit amount of memory used by cloudstack-agent jsvc
The -Xms value specifies the minimum heap size the JVM should start with and
-Xmx is the maximum heap size it can grow. The previous fix imposed minimum
limit of 1G which is unreasonably for small deployments. The fix is to start
with 256MB and limit to 2G for cloudstack-agent process. This was tested on
DevCloud/KVM and then again on a ACS/KVM deployment on real hardware.
With these values, it's possible for the agent to work in a DevCloud/KVM
environment and if JVM needs it can increase the heap size to 2G. The fix also
ports these settings to Debian cloud-agent init.d script as well.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb81082e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb81082e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb81082e
Branch: refs/heads/4.3
Commit: bb81082e58d90da9971b7e06f4c3f8639446b2d2
Parents: 20de43f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Nov 25 18:01:12 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 18:03:53 2014 +0530
----------------------------------------------------------------------
packaging/centos63/cloud-agent.rc | 2 +-
packaging/debian/init/cloud-agent | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb81082e/packaging/centos63/cloud-agent.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
index e9b203e..8918e50 100755
--- a/packaging/centos63/cloud-agent.rc
+++ b/packaging/centos63/cloud-agent.rc
@@ -66,7 +66,7 @@ export CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:$PCP:/etc/cloudstack/a
start() {
echo -n $"Starting $PROGNAME: "
if hostname --fqdn >/dev/null 2>&1 ; then
- $JSVC -Xms1024m -Xmx2048m -cp "$CLASSPATH" -pidfile "$PIDFILE" \
+ $JSVC -Xms256m -Xmx2048m -cp "$CLASSPATH" -pidfile "$PIDFILE" \
-errfile $LOGDIR/cloudstack-agent.err -outfile $LOGDIR/cloudstack-agent.out $CLASS
RETVAL=$?
echo
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb81082e/packaging/debian/init/cloud-agent
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-agent b/packaging/debian/init/cloud-agent
index 5720d74..a14e8a2 100755
--- a/packaging/debian/init/cloud-agent
+++ b/packaging/debian/init/cloud-agent
@@ -96,7 +96,7 @@ start() {
wait_for_network
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -Djna.nosys=true -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
+ if start_daemon -p $PIDFILE $DAEMON -Xms256m -Xmx2048m -cp "$CLASSPATH" -Djna.nosys=true -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
RETVAL=$?
then
rc=0