[flink-docker] branch dev-master updated: [FLINK-21035] Deduplicate 'copy_plugins_if_required' calls

[chesnay]

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch dev-master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git


The following commit(s) were added to refs/heads/dev-master by this push:
     new eabaf90  [FLINK-21035] Deduplicate 'copy_plugins_if_required' calls
eabaf90 is described below

commit eabaf907bf4ab2a26f95a6659a1139c8a875d135
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Wed Jan 20 00:50:28 2021 +0100

    [FLINK-21035] Deduplicate 'copy_plugins_if_required' calls
---
 docker-entrypoint.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b8e6804..c82b7f0 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -82,7 +82,6 @@ set_common_options() {
 
 prepare_job_manager_start() {
     echo "Starting Job Manager"
-    copy_plugins_if_required
 
     set_common_options
 
@@ -100,6 +99,8 @@ maybe_enable_jemalloc() {
 
 maybe_enable_jemalloc
 
+copy_plugins_if_required
+
 args=("$@")
 if [ "$1" = "help" ]; then
     printf "Usage: $(basename "$0") 
(jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER})\n"
@@ -122,7 +123,6 @@ elif [ "$1" = ${COMMAND_HISTORY_SERVER} ]; then
     args=("${args[@]:1}")
 
     echo "Starting History Server"
-    copy_plugins_if_required
 
     if [ -n "${FLINK_PROPERTIES}" ]; then
         echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
@@ -134,7 +134,6 @@ elif [ "$1" = "taskmanager" ]; then
     args=("${args[@]:1}")
 
     echo "Starting Task Manager"
-    copy_plugins_if_required
 
     
TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep 
-c ^processor /proc/cpuinfo)}
 
@@ -151,8 +150,6 @@ fi
 
 args=("${args[@]}")
 
-copy_plugins_if_required
-
 # Set the Flink related environments
 export _FLINK_HOME_DETERMINED=true
 . $FLINK_HOME/bin/config.sh