Repository: flink Updated Branches: refs/heads/master 2bea79341 -> 10cb2fafc
[FLINK-1468] [scripts] Cancel job/task manager startup when misconfigured heap sizes Addresses comments here: https://github.com/apache/flink/commit/2bea79341eb0f2fafd1537b15ca212eb5792f950 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/10cb2faf Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/10cb2faf Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/10cb2faf Branch: refs/heads/master Commit: 10cb2fafc8a239e55f83e0c9fb71bda4aa32352b Parents: 2bea793 Author: Ufuk Celebi <u...@apache.org> Authored: Wed Feb 4 13:55:31 2015 +0100 Committer: Ufuk Celebi <u...@apache.org> Committed: Wed Feb 4 14:13:46 2015 +0100 ---------------------------------------------------------------------- flink-dist/src/main/flink-bin/bin/jobmanager.sh | 14 +++++++------- flink-dist/src/main/flink-bin/bin/taskmanager.sh | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/10cb2faf/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 e1c84ce..808bc32 100755 --- a/flink-dist/src/main/flink-bin/bin/jobmanager.sh +++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh @@ -63,18 +63,18 @@ 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." + echo "ERROR: Configured job manager heap size is not a number. Cancelling job manager startup." - FLINK_JM_HEAP=0 + exit 1 fi - if [[ ! ${FLINK_TM_HEAP} =~ $IS_NUMBER ]]; then - echo "WARNING: Configured task manager heap size is not a number. Falling back to default." + if [ "$EXECUTIONMODE" = "local" ]; then + if [[ ! ${FLINK_TM_HEAP} =~ $IS_NUMBER ]]; then + echo "ERROR: Configured task manager heap size is not a number. Cancelling (local) job manager startup." - FLINK_TM_HEAP=0 - fi + exit 1 + fi - if [ "$EXECUTIONMODE" = "local" ]; then FLINK_JM_HEAP=`expr $FLINK_JM_HEAP + $FLINK_TM_HEAP` fi http://git-wip-us.apache.org/repos/asf/flink/blob/10cb2faf/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 e6c6c0a..72562c2 100755 --- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh +++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh @@ -62,9 +62,8 @@ 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 + echo "ERROR: Configured task manager heap size is not a number. Cancelling task manager startup." + exit 1 fi if [ "$FLINK_TM_HEAP" -gt 0 ]; then
