You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2015/02/03 17:13:40 UTC
[2/2] flink git commit: [FLINK-1468] [scripts] Add integer check for
job/task manager heap size config values
[FLINK-1468] [scripts] Add integer check for job/task manager heap size config values
Print a warning message if misconfigured.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2bea7934
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2bea7934
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2bea7934
Branch: refs/heads/master
Commit: 2bea79341eb0f2fafd1537b15ca212eb5792f950
Parents: 3ec6430
Author: Ufuk Celebi <uc...@apache.org>
Authored: Tue Feb 3 16:07:56 2015 +0100
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Tue Feb 3 17:01:50 2015 +0100
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/config.sh | 2 ++
flink-dist/src/main/flink-bin/bin/jobmanager.sh | 29 +++++++++++++++-----
.../src/main/flink-bin/bin/taskmanager.sh | 15 +++++++---
3 files changed, 35 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2bea7934/flink-dist/src/main/flink-bin/bin/config.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index 64128df..c0a48ba 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -153,6 +153,8 @@ if [ -z "${HOSTNAME}" ]; then
HOSTNAME=`hostname`
fi
+IS_NUMBER="^[0-9]+$"
+
# Define FLINK_JM_HEAP if it is not already set
if [ -z "${FLINK_JM_HEAP}" ]; then
FLINK_JM_HEAP=$(readFromConfig ${KEY_JOBM_HEAP_MB} 0 "${YAML_CONF}")
http://git-wip-us.apache.org/repos/asf/flink/blob/2bea7934/flink-dist/src/main/flink-bin/bin/jobmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/jobmanager.sh b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
index ddb329f..e1c84ce 100755
--- a/flink-dist/src/main/flink-bin/bin/jobmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
@@ -26,19 +26,13 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
-if [ "$EXECUTIONMODE" = "local" ]; then
- FLINK_JM_HEAP=`expr $FLINK_JM_HEAP + $FLINK_TM_HEAP`
-fi
-
JAVA_VERSION=$($JAVA_RUN -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
if [ "$JAVA_VERSION" -lt 18 ]; then
JVM_ARGS="$JVM_ARGS -XX:MaxPermSize=256m"
fi
-if [ "$FLINK_JM_HEAP" -gt 0 ]; then
- JVM_ARGS="$JVM_ARGS -Xms"$FLINK_JM_HEAP"m -Xmx"$FLINK_JM_HEAP"m"
-fi
+
if [ "$FLINK_IDENT_STRING" = "" ]; then
FLINK_IDENT_STRING="$USER"
@@ -67,6 +61,27 @@ log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4
case $STARTSTOP in
(start)
+
+ if [[ ! ${FLINK_JM_HEAP} =~ $IS_NUMBER ]]; then
+ echo "WARNING: Configured job manager heap size is not a number. Falling back to default."
+
+ FLINK_JM_HEAP=0
+ fi
+
+ if [[ ! ${FLINK_TM_HEAP} =~ $IS_NUMBER ]]; then
+ echo "WARNING: Configured task manager heap size is not a number. Falling back to default."
+
+ FLINK_TM_HEAP=0
+ fi
+
+ if [ "$EXECUTIONMODE" = "local" ]; then
+ FLINK_JM_HEAP=`expr $FLINK_JM_HEAP + $FLINK_TM_HEAP`
+ fi
+
+ if [ "$FLINK_JM_HEAP" -gt 0 ]; then
+ JVM_ARGS="$JVM_ARGS -Xms"$FLINK_JM_HEAP"m -Xmx"$FLINK_JM_HEAP"m"
+ fi
+
mkdir -p "$FLINK_PID_DIR"
if [ -f $pid ]; then
if kill -0 `cat $pid` > /dev/null 2>&1; then
http://git-wip-us.apache.org/repos/asf/flink/blob/2bea7934/flink-dist/src/main/flink-bin/bin/taskmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index c63b0ae..e6c6c0a 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -57,13 +57,20 @@ if [ "$JAVA_VERSION" -lt 18 ]; then
JVM_ARGS="$JVM_ARGS -XX:MaxPermSize=256m"
fi
-if [ "$FLINK_TM_HEAP" -gt 0 ]; then
- JVM_ARGS="$JVM_ARGS -Xms"$FLINK_TM_HEAP"m -Xmx"$FLINK_TM_HEAP"m"
-fi
-
case $STARTSTOP in
(start)
+
+ if [[ ! ${FLINK_TM_HEAP} =~ ${IS_NUMBER} ]]; then
+ echo "WARNING: Configured task manager heap size is not a number. Falling back to default."
+
+ FLINK_TM_HEAP=0
+ fi
+
+ if [ "$FLINK_TM_HEAP" -gt 0 ]; then
+ JVM_ARGS="$JVM_ARGS -Xms"$FLINK_TM_HEAP"m -Xmx"$FLINK_TM_HEAP"m"
+ fi
+
mkdir -p "$FLINK_PID_DIR"
if [ -f $pid ]; then
if kill -0 `cat $pid` > /dev/null 2>&1; then