X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fsrc%2Fmain%2Fresources%2Frun.sh;h=64f2c877f7ea60f2e87f13bb9d4b173a11d7a16d;hb=32275b7cbe98c361f08970eff34ecb721f45c9e4;hp=313b3b2c79cdd18dbf585f6a76adbeecf8e688f9;hpb=a0d6ba5c0dba435b963aa113469a5f52bc8245fd;p=controller.git diff --git a/opendaylight/distribution/opendaylight/src/main/resources/run.sh b/opendaylight/distribution/opendaylight/src/main/resources/run.sh index 313b3b2c79..64f2c877f7 100755 --- a/opendaylight/distribution/opendaylight/src/main/resources/run.sh +++ b/opendaylight/distribution/opendaylight/src/main/resources/run.sh @@ -1,9 +1,5 @@ #!/bin/bash -[[ -z ${JAVA_HOME} ]] && echo "Need to set JAVA_HOME environment variable" && exit -1; -[[ ! -x ${JAVA_HOME}/bin/java ]] && echo "Cannot find an executable \ -JVM at path ${JAVA_HOME}/bin/java check your JAVA_HOME" && exit -1; - platform='unknown' unamestr=`uname` if [[ "$unamestr" == 'Linux' ]]; then @@ -14,17 +10,26 @@ fi if [[ $platform == 'linux' ]]; then fullpath=`readlink -f $0` + + if [[ -z ${JAVA_HOME} ]]; then + # Find the actual location of the Java launcher: + java_launcher=`which java` + java_launcher=`readlink -f "${java_launcher}"` + + # Compute the Java home from the location of the Java launcher: + export JAVA_HOME="${java_launcher%/bin/java}" + fi elif [[ $platform == 'osx' ]]; then TARGET_FILE=$0 - cd `dirname $TARGET_FILE` + cd `dirname "$TARGET_FILE"` TARGET_FILE=`basename $TARGET_FILE` # Iterate down a (possible) chain of symlinks while [ -L "$TARGET_FILE" ] do - TARGET_FILE=`readlink $TARGET_FILE` - cd `dirname $TARGET_FILE` - TARGET_FILE=`basename $TARGET_FILE` + TARGET_FILE=`readlink "$TARGET_FILE"` + cd `dirname "$TARGET_FILE"` + TARGET_FILE=`basename "$TARGET_FILE"` done # Compute the canonicalized name by finding the physical path @@ -32,19 +37,36 @@ elif [[ $platform == 'osx' ]]; then PHYS_DIR=`pwd -P` RESULT=$PHYS_DIR/$TARGET_FILE fullpath=$RESULT + + [[ -z ${JAVA_HOME} ]] && [[ -x "/usr/libexec/java_home" ]] && export JAVA_HOME=`/usr/libexec/java_home -v 1.7`; + +fi + +[[ -z ${JAVA_HOME} ]] && echo "Need to set JAVA_HOME environment variable" && exit -1; +[[ ! -x ${JAVA_HOME}/bin/java ]] && echo "Cannot find an executable \ +JVM at path ${JAVA_HOME}/bin/java check your JAVA_HOME" && exit -1; + +if [ -z ${ODL_BASEDIR} ]; then + basedir=`dirname "${fullpath}"` +else + basedir=${ODL_BASEDIR} fi -basedir=`dirname ${fullpath}` +if [ -z ${ODL_DATADIR} ]; then + datadir=`dirname "${fullpath}"` +else + datadir=${ODL_DATADIR} +fi function usage { - echo "Usage: $0 [-debug] [-debugsuspend] [-debugport ] [-start []] [-stop] [-status] [-console] [-help] []" + echo "Usage: $0 [-jmx] [-jmxport ] [-debug] [-debugsuspend] [-debugport ] [-start []] [-stop] [-status] [-console] [-help] [-agentpath:] []" exit 1 } -if [ -v "TMP" ]; then - pidfile="${TMP}/opendaylight.PID" -else +if [ -z ${TMP} ]; then pidfile="/tmp/opendaylight.PID" +else + pidfile="${TMP}/opendaylight.PID" fi debug=0 debugsuspend=0 @@ -53,17 +75,23 @@ debugportread="" startdaemon=0 daemonport=2400 daemonportread="" +jmxport=1088 +jmxportread="" +startjmx=0 stopdaemon=0 statusdaemon=0 consolestart=1 dohelp=0 extraJVMOpts="" +agentPath="" unknown_option=0 while true ; do case "$1" in -debug) debug=1; shift ;; + -jmx) startjmx=1; shift ;; -debugsuspend) debugsuspend=1; shift ;; -debugport) shift; debugportread="$1"; if [[ "${debugportread}" =~ ^[0-9]+$ ]] ; then debugport=${debugportread}; shift; else echo "-debugport expects a number but was not found"; exit -1; fi;; + -jmxport) shift; jmxportread="$1"; if [[ "${jmxportread}" =~ ^[0-9]+$ ]] ; then jmxport=${jmxportread}; shift; else echo "-jmxport expects a number but was not found"; exit -1; fi;; -start) startdaemon=1; shift; daemonportread="$1"; if [[ "${daemonportread}" =~ ^[0-9]+$ ]] ; then daemonport=${daemonportread}; shift; fi;; -stop) stopdaemon=1; shift ;; -status) statusdaemon=1; shift ;; @@ -71,6 +99,7 @@ while true ; do -help) dohelp=1; shift;; -D*) extraJVMOpts="${extraJVMOpts} $1"; shift;; -X*) extraJVMOpts="${extraJVMOpts} $1"; shift;; + -agentpath:*) agentPath="$1"; shift;; "") break ;; *) echo "Unknown option $1"; unknown_option=1; shift ;; esac @@ -97,6 +126,12 @@ if [[ "${daemonport}" -lt 1024 ]] || [[ "${daemonport}" -gt 65535 ]]; then exit -1 fi +# Validate jmx port +if [[ "${jmxport}" -lt 1024 ]] || [[ "${jmxport}" -gt 65535 ]]; then + echo "JMX Port not in the range [1024,65535] value is ${jmxport}" + exit -1 +fi + # Debug options if [ "${debugsuspend}" -eq 1 ]; then extraJVMOpts="${extraJVMOpts} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debugport}" @@ -104,11 +139,16 @@ elif [ "${debug}" -eq 1 ]; then extraJVMOpts="${extraJVMOpts} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${debugport}" fi +# Add JMX support +if [ "${startjmx}" -eq 1 ]; then + extraJVMOpts="${extraJVMOpts} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=${jmxport} -Dcom.sun.management.jmxremote" +fi + ######################################## # Now add to classpath the OSGi JAR ######################################## -CLASSPATH=${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar -FWCLASSPATH=file:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar +CLASSPATH="${basedir}"/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar +FWCLASSPATH=file:"${basedir}"/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar ######################################## # Now add the extensions @@ -126,6 +166,8 @@ FWCLASSPATH=${FWCLASSPATH},file:${basedir}/lib/org.eclipse.virgo.kernel.equinox. CLASSPATH=${CLASSPATH}:${basedir}/lib/org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar FWCLASSPATH=${FWCLASSPATH},file:${basedir}/lib/org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar +cd $basedir + if [ "${stopdaemon}" -eq 1 ]; then if [ -e "${pidfile}" ]; then daemonpid=`cat "${pidfile}"` @@ -150,7 +192,7 @@ if [ "${statusdaemon}" -eq 1 ]; then else echo "Controller with PID: ${daemonpid} -- Doesn't seem to exist" rm -f "${pidfile}" - exit 0 + exit 1 fi else echo "Doesn't seem any Controller daemon is currently running, at least no PID file has been found" @@ -158,18 +200,25 @@ if [ "${statusdaemon}" -eq 1 ]; then fi fi +iotmpdir=`echo "${datadir}" | sed 's/ /\\ /g'` +bdir=`echo "${basedir}" | sed 's/ /\\ /g'` +confarea=`echo "${datadir}" | sed 's/ /\\ /g'` +fwclasspath=`echo "${FWCLASSPATH}" | sed 's/ /\\ /g'` + if [ "${startdaemon}" -eq 1 ]; then if [ -e "${pidfile}" ]; then echo "Another instance of controller running, check with $0 -status" exit -1 fi $JAVA_HOME/bin/java ${extraJVMOpts} \ - -Djava.io.tmpdir=${basedir}/work/tmp \ - -Dosgi.install.area=${basedir} \ - -Dosgi.configuration.area=${basedir}/configuration \ - -Dosgi.frameworkClassPath=${FWCLASSPATH} \ - -Dosgi.framework=file:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar \ - -classpath ${CLASSPATH} \ + ${agentPath} \ + -Djava.io.tmpdir="${iotmpdir}/work/tmp" \ + -Dosgi.install.area="${bdir}" \ + -Dosgi.configuration.area="${confarea}/configuration" \ + -Dosgi.frameworkClassPath="${fwclasspath}" \ + -Dosgi.framework=file:"${bdir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar" \ + -Djava.awt.headless=true \ + -classpath "${CLASSPATH}" \ org.eclipse.equinox.launcher.Main \ -console ${daemonport} \ -consoleLog & @@ -181,12 +230,14 @@ elif [ "${consolestart}" -eq 1 ]; then exit -1 fi $JAVA_HOME/bin/java ${extraJVMOpts} \ - -Djava.io.tmpdir=${basedir}/work/tmp \ - -Dosgi.install.area=${basedir} \ - -Dosgi.configuration.area=${basedir}/configuration \ - -Dosgi.frameworkClassPath=${FWCLASSPATH} \ - -Dosgi.framework=file:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar \ - -classpath ${CLASSPATH} \ + ${agentPath} \ + -Djava.io.tmpdir="${iotmpdir}/work/tmp" \ + -Dosgi.install.area="${bdir}" \ + -Dosgi.configuration.area="${confarea}/configuration" \ + -Dosgi.frameworkClassPath="${fwclasspath}" \ + -Dosgi.framework=file:"${bdir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar" \ + -Djava.awt.headless=true \ + -classpath "${CLASSPATH}" \ org.eclipse.equinox.launcher.Main \ -console \ -consoleLog