Repository: flink Updated Branches: refs/heads/master a6890b284 -> e71196972
[FLINK-2865] remove upper direct memory size bound - set the upper bound to Long.MAX_VALUE For YARN, we set it to the calculated maximum container size (no need to fix). Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6c44d93d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6c44d93d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6c44d93d Branch: refs/heads/master Commit: 6c44d93d0a9da725ef8b1ad2a94889f79321db73 Parents: a6890b2 Author: Maximilian Michels <[email protected]> Authored: Mon Oct 19 16:17:07 2015 +0200 Committer: Maximilian Michels <[email protected]> Committed: Tue Oct 20 10:10:42 2015 +0200 ---------------------------------------------------------------------- flink-dist/src/main/flink-bin/bin/taskmanager.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/6c44d93d/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 fd29a93..f69dd1c 100755 --- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh +++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh @@ -59,8 +59,9 @@ if [[ $STARTSTOP == "start" ]]; then if [ "${FLINK_TM_HEAP}" -gt "0" ]; then TM_HEAP_SIZE=${FLINK_TM_HEAP} - # This is an upper bound, much less direct memory will be used - TM_MAX_OFFHEAP_SIZE=${FLINK_TM_HEAP} + # Long.MAX_VALUE in TB: This is an upper bound, much less direct memory will be used + # + TM_MAX_OFFHEAP_SIZE="8388607T" if [[ "${STREAMINGMODE}" == "batch" ]] && useOffHeapMemory; then if [[ "${FLINK_TM_MEM_MANAGED_SIZE}" -gt "0" ]]; then @@ -88,7 +89,7 @@ if [[ $STARTSTOP == "start" ]]; then fi fi - export JVM_ARGS="${JVM_ARGS} -Xms${TM_HEAP_SIZE}M -Xmx${TM_HEAP_SIZE}M -XX:MaxDirectMemorySize=${TM_MAX_OFFHEAP_SIZE}M" + export JVM_ARGS="${JVM_ARGS} -Xms${TM_HEAP_SIZE}M -Xmx${TM_HEAP_SIZE}M -XX:MaxDirectMemorySize=${TM_MAX_OFFHEAP_SIZE}" fi
