You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2015/04/15 21:50:06 UTC
[32/50] [abbrv] incubator-lens git commit: LENS-428 : Honors
LENS_SERVER_HEAP and LENS_CLIENT_HEAP values set (Arshad Matin via
amareshwari)
LENS-428 : Honors LENS_SERVER_HEAP and LENS_CLIENT_HEAP values set (Arshad Matin via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/07492f18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/07492f18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/07492f18
Branch: refs/heads/current-release-line
Commit: 07492f187f3b14a927b9e72c62c95be625221764
Parents: d597314
Author: Arshad Matin <ar...@gmail.com>
Authored: Tue Apr 7 17:46:35 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Apr 7 17:46:35 2015 +0530
----------------------------------------------------------------------
tools/scripts/lens-config.sh | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/07492f18/tools/scripts/lens-config.sh
----------------------------------------------------------------------
diff --git a/tools/scripts/lens-config.sh b/tools/scripts/lens-config.sh
index 0e810cb..4470132 100644
--- a/tools/scripts/lens-config.sh
+++ b/tools/scripts/lens-config.sh
@@ -72,16 +72,17 @@ if [ ! -e $JAVA_BIN ] || [ ! -e $JAR_BIN ]; then
exit 1
fi
-# default the heap size to 1GB
DEFAULT_JAVA_HEAP_MAX=-Xmx1024m
-LENS_OPTS="$DEFAULT_JAVA_HEAP_MAX $LENS_OPTS"
-
type="$1"
shift
case $type in
client)
# set the client class path
LENSCPPATH=$LENS_CONF:`ls ${BASEDIR}/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null`
+ if test -z "$LENS_CLIENT_HEAP"
+ then
+ LENS_CLIENT_HEAP=$DEFAULT_JAVA_HEAP_MAX
+ fi
LENS_OPTS="$LENS_OPTS $LENS_CLIENT_OPTS $LENS_CLIENT_HEAP"
LENS_LOG_DIR="${LENS_LOG_DIR:-$BASEDIR/logs}"
export LENS_LOG_DIR
@@ -89,6 +90,10 @@ case $type in
export LENS_HOME_DIR
;;
server)
+ if test -z "$LENS_SERVER_HEAP"
+ then
+ LENS_SERVER_HEAP=$DEFAULT_JAVA_HEAP_MAX
+ fi
LENS_OPTS="$LENS_OPTS $LENS_SERVER_OPTS $LENS_SERVER_HEAP"
LENSCPPATH="$LENS_CONF"
LENS_EXPANDED_WEBAPP_DIR=${LENS_EXPANDED_WEBAPP_DIR:-${BASEDIR}/webapp}