This is an automated email from the ASF dual-hosted git repository.
azagrebin pushed a commit to branch flip116
in repository https://gitbox.apache.org/repos/asf/flink.git
commit c9568d04a49451bef2114657e4c22640d3075194
Author: Andrey Zagrebin <azagre...@apache.org>
AuthorDate: Mon Apr 20 19:46:08 2020 +0300
[FLINK-17048] Add memory related JVM args to Mesos JM startup scripts
---
.../main/flink-bin/mesos-bin/mesos-appmaster-job.sh | 19 +------------------
.../src/main/flink-bin/mesos-bin/mesos-appmaster.sh | 21 +--------------------
.../{mesos-appmaster.sh => mesos-jobmanager.sh} | 17 +++++++++++++++--
.../test-scripts/test_kubernetes_session.sh | 2 +-
4 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh
b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh
index f2e419f..d928631 100755
--- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh
+++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh
@@ -23,21 +23,4 @@ bin=`cd "$bin"; pwd`
# get Flink config
. "$bin"/config.sh
-if [ "$FLINK_IDENT_STRING" = "" ]; then
- FLINK_IDENT_STRING="$USER"
-fi
-
-CC_CLASSPATH=`manglePathList
$(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPATHS`
-
-log="${FLINK_LOG_DIR}/flink-${FLINK_IDENT_STRING}-mesos-appmaster-${HOSTNAME}.log"
-log_setting="-Dlog.file="$log"
-Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties
-Dlog4j.configurationFile=file:"$FLINK_CONF_DIR"/log4j.properties
-Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml"
-
-exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting
org.apache.flink.mesos.entrypoint.MesosJobClusterEntrypoint "$@"
-
-rc=$?
-
-if [[ $rc -ne 0 ]]; then
- echo "Error while starting the mesos application master. Please check
${log} for more details."
-fi
-
-exit $rc
+exec "${FLINK_BIN_DIR}"/mesos-jobmanager.sh
"org.apache.flink.mesos.entrypoint.MesosJobClusterEntrypoint"
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
index 20c88ea..ab68d1b 100755
--- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
+++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
@@ -23,23 +23,4 @@ bin=`cd "$bin"; pwd`
# get Flink config
. "$bin"/config.sh
-if [ "$FLINK_IDENT_STRING" = "" ]; then
- FLINK_IDENT_STRING="$USER"
-fi
-
-CC_CLASSPATH=`manglePathList
$(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPATHS`
-
-log="${FLINK_LOG_DIR}/flink-${FLINK_IDENT_STRING}-mesos-appmaster-${HOSTNAME}.log"
-log_setting="-Dlog.file="$log"
-Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties
-Dlog4j.configurationFile=file:"$FLINK_CONF_DIR"/log4j.properties
-Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml"
-
-ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosSessionClusterEntrypoint
-
-exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting
${ENTRY_POINT} "$@"
-
-rc=$?
-
-if [[ $rc -ne 0 ]]; then
- echo "Error while starting the mesos application master. Please check
${log} for more details."
-fi
-
-exit $rc
+exec "${FLINK_BIN_DIR}"/mesos-jobmanager.sh
"org.apache.flink.mesos.entrypoint.MesosSessionClusterEntrypoint"
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
b/flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh
similarity index 78%
copy from flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
copy to flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh
index 20c88ea..64cbe7d 100755
--- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
+++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh
@@ -17,12 +17,27 @@
# limitations under the License.
################################################################################
+ENTRY_POINT=$1
+
bin=`dirname "$0"`
bin=`cd "$bin"; pwd`
# get Flink config
. "$bin"/config.sh
+java_utils_output=$(runBashJavaUtilsCmd GET_JM_RESOURCE_PARAMS
${FLINK_CONF_DIR} $FLINK_BIN_DIR/bash-java-utils.jar:$(findFlinkDistJar)
"${ARGS[@]}")
+logging_output=$(extractLoggingOutputs "${java_utils_output}")
+jvm_params=$(extractExecutionResults "${java_utils_output}" 1)
+export JVM_ARGS="${JVM_ARGS} ${jvm_params}"
+
+export FLINK_INHERITED_LOGS="
+$FLINK_INHERITED_LOGS
+
+JM_RESOURCE_PARAMS extraction logs:
+jvm_params: $jvm_params
+logs: $logging_output
+"
+
if [ "$FLINK_IDENT_STRING" = "" ]; then
FLINK_IDENT_STRING="$USER"
fi
@@ -32,8 +47,6 @@ CC_CLASSPATH=`manglePathList
$(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPA
log="${FLINK_LOG_DIR}/flink-${FLINK_IDENT_STRING}-mesos-appmaster-${HOSTNAME}.log"
log_setting="-Dlog.file="$log"
-Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties
-Dlog4j.configurationFile=file:"$FLINK_CONF_DIR"/log4j.properties
-Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml"
-ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosSessionClusterEntrypoint
-
exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting
${ENTRY_POINT} "$@"
rc=$?
diff --git a/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
index b45e1c3..6dd4083 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
@@ -64,7 +64,7 @@ mkdir -p "$(dirname $LOCAL_OUTPUT_PATH)"
# Set the memory and cpu smaller than default, so that the jobmanager and
taskmanager pods could be allocated in minikube.
"$FLINK_DIR"/bin/kubernetes-session.sh -Dkubernetes.cluster-id=${CLUSTER_ID} \
-Dkubernetes.container.image=${FLINK_IMAGE_NAME} \
- -Djobmanager.memory.process.size=768m \
+ -Djobmanager.memory.process.size=1088m \
-Dkubernetes.jobmanager.cpu=0.5 \
-Dkubernetes.taskmanager.cpu=0.5 \
-Dkubernetes.container-start-command-template="%java% %classpath% %jvmmem%
%jvmopts% %logging% %class% %args%" \
