You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/09/27 13:47:36 UTC
[flink] branch master updated: [FLINK-10393] Remove legacy
entrypoints from start up scripts
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new d43a1dd [FLINK-10393] Remove legacy entrypoints from start up scripts
d43a1dd is described below
commit d43a1dd397dbc7c0559a07b83380fed164114241
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Sat Sep 22 19:30:40 2018 +0200
[FLINK-10393] Remove legacy entrypoints from start up scripts
This commit removes the legacy entrypoints from the startup scripts.
---
flink-dist/src/main/flink-bin/bin/config.sh | 7 -------
flink-dist/src/main/flink-bin/bin/flink-console.sh | 10 +---------
flink-dist/src/main/flink-bin/bin/flink-daemon.sh | 10 +---------
flink-dist/src/main/flink-bin/bin/jobmanager.sh | 10 +++-------
flink-dist/src/main/flink-bin/bin/taskmanager.sh | 12 ++++--------
flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh | 6 +-----
flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh | 6 +-----
7 files changed, 11 insertions(+), 50 deletions(-)
diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index 537c8dc..1d38e2a 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -134,8 +134,6 @@ KEY_ENV_SSH_OPTS="env.ssh.opts"
KEY_HIGH_AVAILABILITY="high-availability"
KEY_ZK_HEAP_MB="zookeeper.heap.mb"
-KEY_FLINK_MODE="mode"
-
########################################################################################################################
# MEMORY SIZE UNIT
########################################################################################################################
@@ -431,11 +429,6 @@ if [ -z "${FLINK_TM_NET_BUF_MAX}" -o "${FLINK_TM_NET_BUF_MAX}" = "-1" ]; then
FLINK_TM_NET_BUF_MAX=$(parseBytes ${FLINK_TM_NET_BUF_MAX})
fi
-# Define FLIP if it is not already set
-if [ -z "${FLINK_MODE}" ]; then
- FLINK_MODE=$(readFromConfig ${KEY_FLINK_MODE} "new" "${YAML_CONF}")
-fi
-
# Verify that NUMA tooling is available
command -v numactl >/dev/null 2>&1
diff --git a/flink-dist/src/main/flink-bin/bin/flink-console.sh b/flink-dist/src/main/flink-bin/bin/flink-console.sh
index 64a428d..a5168fe 100644
--- a/flink-dist/src/main/flink-bin/bin/flink-console.sh
+++ b/flink-dist/src/main/flink-bin/bin/flink-console.sh
@@ -19,7 +19,7 @@
# Start a Flink service as a console application. Must be stopped with Ctrl-C
# or with SIGTERM by kill or the controlling process.
-USAGE="Usage: flink-console.sh (jobmanager|taskmanager|taskexecutor|zookeeper|historyserver|standalonesession|standalonejob) [args]"
+USAGE="Usage: flink-console.sh (taskexecutor|zookeeper|historyserver|standalonesession|standalonejob) [args]"
SERVICE=$1
ARGS=("${@:2}") # get remaining arguments as array
@@ -30,14 +30,6 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
case $SERVICE in
- (jobmanager)
- CLASS_TO_RUN=org.apache.flink.runtime.jobmanager.JobManager
- ;;
-
- (taskmanager)
- CLASS_TO_RUN=org.apache.flink.runtime.taskmanager.TaskManager
- ;;
-
(taskexecutor)
CLASS_TO_RUN=org.apache.flink.runtime.taskexecutor.TaskManagerRunner
;;
diff --git a/flink-dist/src/main/flink-bin/bin/flink-daemon.sh b/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
index 3a9f61d..6ff5d95 100644
--- a/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
+++ b/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
@@ -18,7 +18,7 @@
################################################################################
# Start/stop a Flink daemon.
-USAGE="Usage: flink-daemon.sh (start|stop|stop-all) (jobmanager|taskmanager|taskexecutor|zookeeper|historyserver|standalonesession|standalonejob) [args]"
+USAGE="Usage: flink-daemon.sh (start|stop|stop-all) (taskexecutor|zookeeper|historyserver|standalonesession|standalonejob) [args]"
STARTSTOP=$1
DAEMON=$2
@@ -30,14 +30,6 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
case $DAEMON in
- (jobmanager)
- CLASS_TO_RUN=org.apache.flink.runtime.jobmanager.JobManager
- ;;
-
- (taskmanager)
- CLASS_TO_RUN=org.apache.flink.runtime.taskmanager.TaskManager
- ;;
-
(taskexecutor)
CLASS_TO_RUN=org.apache.flink.runtime.taskexecutor.TaskManagerRunner
;;
diff --git a/flink-dist/src/main/flink-bin/bin/jobmanager.sh b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
index 60ff450..9efb83e 100755
--- a/flink-dist/src/main/flink-bin/bin/jobmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
@@ -34,11 +34,7 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
-JOBMANAGER_TYPE=jobmanager
-
-if [[ "${FLINK_MODE}" == "new" ]]; then
- JOBMANAGER_TYPE=standalonesession
-fi
+ENTRYPOINT=standalonesession
if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
if [ ! -z "${FLINK_JM_HEAP_MB}" ] && [ "${FLINK_JM_HEAP}" == 0 ]; then
@@ -74,7 +70,7 @@ if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
fi
if [[ $STARTSTOP == "start-foreground" ]]; then
- exec "${FLINK_BIN_DIR}"/flink-console.sh $JOBMANAGER_TYPE "${args[@]}"
+ exec "${FLINK_BIN_DIR}"/flink-console.sh $ENTRYPOINT "${args[@]}"
else
- "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP $JOBMANAGER_TYPE "${args[@]}"
+ "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP $ENTRYPOINT "${args[@]}"
fi
diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index 0d70f34..b94ecf1 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -34,11 +34,7 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
-TYPE=taskmanager
-
-if [[ "${FLINK_MODE}" == "new" ]]; then
- TYPE=taskexecutor
-fi
+ENTRYPOINT=taskexecutor
if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
@@ -78,11 +74,11 @@ if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
fi
if [[ $STARTSTOP == "start-foreground" ]]; then
- exec "${FLINK_BIN_DIR}"/flink-console.sh $TYPE "${ARGS[@]}"
+ exec "${FLINK_BIN_DIR}"/flink-console.sh $ENTRYPOINT "${ARGS[@]}"
else
if [[ $FLINK_TM_COMPUTE_NUMA == "false" ]]; then
# Start a single TaskManager
- "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP $TYPE "${ARGS[@]}"
+ "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP $ENTRYPOINT "${ARGS[@]}"
else
# Example output from `numactl --show` on an AWS c4.8xlarge:
# policy: default
@@ -94,7 +90,7 @@ else
read -ra NODE_LIST <<< $(numactl --show | grep "^nodebind: ")
for NODE_ID in "${NODE_LIST[@]:1}"; do
# Start a TaskManager for each NUMA node
- numactl --membind=$NODE_ID --cpunodebind=$NODE_ID -- "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP $TYPE "${ARGS[@]}"
+ numactl --membind=$NODE_ID --cpunodebind=$NODE_ID -- "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP $ENTRYPOINT "${ARGS[@]}"
done
fi
fi
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 e629b7e..f8a94b4 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
@@ -36,11 +36,7 @@ export FLINK_CONF_DIR
export FLINK_BIN_DIR
export FLINK_LIB_DIR
-ENTRY_POINT=org.apache.flink.mesos.runtime.clusterframework.MesosApplicationMasterRunner
-
-if [[ "${FLINK_MODE}" == "new" ]]; then
- ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosSessionClusterEntrypoint
-fi
+ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosSessionClusterEntrypoint
exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting ${ENTRY_POINT} "$@"
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh
index 1d8d1b0..a484d09 100755
--- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh
@@ -41,11 +41,7 @@ export FLINK_CONF_DIR
export FLINK_BIN_DIR
export FLINK_LIB_DIR
-ENTRY_POINT=org.apache.flink.mesos.runtime.clusterframework.MesosTaskManager
-
-if [[ "${FLINK_MODE}" == "new" ]]; then
- ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosTaskExecutorRunner
-fi
+ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosTaskExecutorRunner
exec $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} -classpath "$CC_CLASSPATH" $log_setting ${ENTRY_POINT} "$@"