[GitHub] [flink] zentol commented on a change in pull request #11863: [FLINK-17048][mesos] Add memory related JVM args to Mesos JM startup scripts

[GitBox <gi...@apache.org>]

zentol commented on a change in pull request #11863:
URL: https://github.com/apache/flink/pull/11863#discussion_r413667905



##########
File path: flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
##########
@@ -17,29 +17,10 @@
 # limitations under the License.
 ################################################################################
 
-bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=$(dirname "$0")
+bin=$(cd "${bin}" || exit; pwd)
 
 # get Flink config
-. "$bin"/config.sh
+. "${bin}"/config.sh

Review comment:
       Can we not remove this?

##########
File path: flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh
##########
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+################################################################################
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+ENTRY_POINT=$1
+ARGS=("${@:2}")
+
+bin=$(dirname "$0")
+bin=$(cd "${bin}" || exit; 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"
+
+${JAVA_RUN} ${JVM_ARGS} -classpath ${CC_CLASSPATH} ${log_setting} ${ENTRY_POINT} "${ARGS[@]}"

Review comment:
       any particular reason why you removed `exec`? Was it just to be in sync with other Flink scripts (like flink-daemon)?

##########
File path: flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh
##########
@@ -17,27 +17,10 @@
 # limitations under the License.
 ################################################################################
 
-bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=$(dirname "$0")
+bin=$(cd "${bin}" || exit; pwd)
 
 # get Flink config
-. "$bin"/config.sh
+. "${bin}"/config.sh

Review comment:
       Can we not remove this?

##########
File path: flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
##########
@@ -17,29 +17,10 @@
 # limitations under the License.
 ################################################################################
 
-bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=$(dirname "$0")
+bin=$(cd "${bin}" || exit; pwd)
 
 # get Flink config
-. "$bin"/config.sh
+. "${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" "$@"

Review comment:
       is the  ´exec` actually necessary? I see both approaches in `taskmanager.sh`; would be good to make a conscious decision to pick one.

##########
File path: flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh
##########
@@ -26,6 +26,19 @@ bin=$(cd "${bin}" || exit; 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}")

Review comment:
       is there a way to deduplicate this with `taskmanager.sh`? It's _pretty much_ the same thing.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org