Skip to content

Commit

Permalink
restore to before for removing constructTISKubernetesApplicationFlink…
Browse files Browse the repository at this point in the history
…ClassPath
  • Loading branch information
baisui1981 committed Apr 5, 2024
1 parent 69cf146 commit 2b58da6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 13 additions & 13 deletions flink-dist/src/main/flink-bin/bin/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@ constructFlinkClassPath() {
}

# baisui add for 找到除flink开头的jar包,因为k8s application 模式下运行,在flink-dependency 包中都已经有flink相关的依赖了
constructTISKubernetesApplicationFlinkClassPath() {
local FLINK_CLASSPATH
# 找到除flink开头的jar包
while read -d '' -r jarfile ; do
if [[ "$FLINK_CLASSPATH" == "" ]]; then
FLINK_CLASSPATH="$jarfile";
else
FLINK_CLASSPATH="$FLINK_CLASSPATH":"$jarfile"
fi
done < <(find "$FLINK_LIB_DIR" ! -type d ! -name 'flink-*.jar' -print0 | sort -z)

echo "$FLINK_CLASSPATH"
}
#constructTISKubernetesApplicationFlinkClassPath() {
# local FLINK_CLASSPATH
# # 找到除flink开头的jar包
# while read -d '' -r jarfile ; do
# if [[ "$FLINK_CLASSPATH" == "" ]]; then
# FLINK_CLASSPATH="$jarfile";
# else
# FLINK_CLASSPATH="$FLINK_CLASSPATH":"$jarfile"
# fi
# done < <(find "$FLINK_LIB_DIR" ! -type d ! -name 'flink-*.jar' -print0 | sort -z)
#
# echo "$FLINK_CLASSPATH"
#}

findFlinkDistJar() {
local FLINK_DIST
Expand Down
2 changes: 1 addition & 1 deletion flink-dist/src/main/flink-bin/bin/flink-console.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ case $SERVICE in

(kubernetes-application)
# baisui modify for tis entrypoint 2024/01/09
FLINK_TM_CLASSPATH=`constructTISKubernetesApplicationFlinkClassPath`
# FLINK_TM_CLASSPATH=`constructTISKubernetesApplicationFlinkClassPath`
CLASS_TO_RUN=org.apache.flink.kubernetes.entrypoint.KubernetesApplicationClusterEntrypointOfTIS
;;

Expand Down

0 comments on commit 2b58da6

Please sign in to comment.