mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
3fe1f732d7
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 <rohit.yadav@shapeblue.com> (cherry picked from commit bb81082e58d90da9971b7e06f4c3f8639446b2d2) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
118 lines
3.5 KiB
Bash
Executable File
118 lines
3.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# chkconfig: 35 99 10
|
|
# description: Cloud Agent
|
|
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
|
|
|
|
. /etc/rc.d/init.d/functions
|
|
|
|
# set environment variables
|
|
|
|
SHORTNAME=$(basename $0 | sed -e 's/^[SK][0-9][0-9]//')
|
|
PIDFILE=/var/run/"$SHORTNAME".pid
|
|
LOCKFILE=/var/lock/subsys/"$SHORTNAME"
|
|
LOGDIR=/var/log/cloudstack/agent
|
|
LOGFILE=${LOGDIR}/agent.log
|
|
PROGNAME="Cloud Agent"
|
|
CLASS="com.cloud.agent.AgentShell"
|
|
JSVC=`which jsvc 2>/dev/null`;
|
|
|
|
# exit if we don't find jsvc
|
|
if [ -z "$JSVC" ]; then
|
|
echo no jsvc found in path;
|
|
exit 1;
|
|
fi
|
|
|
|
unset OPTIONS
|
|
[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
|
|
|
|
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
|
|
JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
|
|
|
|
for jdir in $JDK_DIRS; do
|
|
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
|
|
JAVA_HOME="$jdir"
|
|
fi
|
|
done
|
|
export JAVA_HOME
|
|
|
|
ACP=`ls /usr/share/cloudstack-agent/lib/*.jar | tr '\n' ':' | sed s'/.$//'`
|
|
PCP=`ls /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null | tr '\n' ':' | sed s'/.$//'`
|
|
|
|
# We need to append the JSVC daemon JAR to the classpath
|
|
# AgentShell implements the JSVC daemon methods
|
|
export CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:$PCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
|
|
|
|
start() {
|
|
echo -n $"Starting $PROGNAME: "
|
|
if hostname --fqdn >/dev/null 2>&1 ; then
|
|
$JSVC -Xms256m -Xmx2048m -cp "$CLASSPATH" -pidfile "$PIDFILE" \
|
|
-errfile $LOGDIR/cloudstack-agent.err -outfile $LOGDIR/cloudstack-agent.out $CLASS
|
|
RETVAL=$?
|
|
echo
|
|
else
|
|
failure
|
|
echo
|
|
echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr
|
|
RETVAL=9
|
|
fi
|
|
[ $RETVAL = 0 ] && touch ${LOCKFILE}
|
|
return $RETVAL
|
|
}
|
|
|
|
stop() {
|
|
echo -n $"Stopping $PROGNAME: "
|
|
$JSVC -pidfile "$PIDFILE" -stop $CLASS
|
|
RETVAL=$?
|
|
echo
|
|
[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
|
|
}
|
|
|
|
case "$1" in
|
|
start)
|
|
start
|
|
;;
|
|
stop)
|
|
stop
|
|
;;
|
|
status)
|
|
status -p ${PIDFILE} $SHORTNAME
|
|
RETVAL=$?
|
|
;;
|
|
restart)
|
|
stop
|
|
sleep 3
|
|
start
|
|
;;
|
|
condrestart)
|
|
if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
|
|
stop
|
|
sleep 3
|
|
start
|
|
fi
|
|
;;
|
|
*)
|
|
echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
|
|
RETVAL=3
|
|
esac
|
|
|
|
exit $RETVAL
|