This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 891142129 BIGTOP-4025:Improve the relevant conf directory for flink
rpm build scripts (#1198)
891142129 is described below
commit 8911421297e6374d9a1353f834bf414a098ec9df
Author: LiJie20190102 <[email protected]>
AuthorDate: Sun Oct 22 23:35:14 2023 +0800
BIGTOP-4025:Improve the relevant conf directory for flink rpm build scripts
(#1198)
* BIGTOP-4007:The path information is incorrect in the zookeeper-client
script file
* BIGTOP-4025:Improve the relevant conf directory for Flink rpm build
scripts
---------
Co-authored-by: lijie0203 <[email protected]>
---
bigtop-packages/src/common/flink/install_flink.sh | 12 ++++--------
bigtop-packages/src/rpm/flink/SPECS/flink.spec | 4 +---
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/bigtop-packages/src/common/flink/install_flink.sh
b/bigtop-packages/src/common/flink/install_flink.sh
index 10ce1ae77..1376404bc 100644
--- a/bigtop-packages/src/common/flink/install_flink.sh
+++ b/bigtop-packages/src/common/flink/install_flink.sh
@@ -30,7 +30,6 @@ usage: $0 <options>
--bin-dir=DIR path to install bins [/usr/bin]
--lib-hadoop=DIR path to hadoop home [/usr/lib/hadoop]
--etc-flink=DIR path to install flink conf [/etc/flink]
- --etc-hadoop=DIR path to hadoop conf [/etc/hadoop]
... [ see source for more similar options ]
"
exit 1
@@ -44,7 +43,6 @@ OPTS=$(getopt \
-l 'bin-dir:' \
-l 'lib-hadoop:' \
-l 'etc-flink:' \
- -l 'etc-hadoop:' \
-l 'source-dir:' \
-l 'build-dir:' -- "$@")
@@ -76,9 +74,6 @@ while true ; do
--etc-flink)
ETC_FLINK=$2 ; shift 2
;;
- --etc-hadoop)
- ETC_HADOOP=$2 ; shift 2
- ;;
--)
shift ; break
;;
@@ -108,9 +103,10 @@ BIN_DIR=${BIN_DIR:-/usr/bin}
LIB_HADOOP=${LIB_HADOOP:-/usr/lib/hadoop}
ETC_FLINK=${ETC_FLINK:-/etc/flink}
-ETC_HADOOP=${ETC_HADOOP:-/etc/hadoop}
+
# No prefix
NP_ETC_FLINK=/etc/flink
+NP_ETC_HADOOP=/etc/hadoop
install -d -m 0755 $PREFIX/$LIB_DIR
install -d -m 0755 $PREFIX/$LIB_DIR/bin
@@ -151,9 +147,9 @@ cat > $PREFIX/$BIN_DIR/flink <<EOF
. /usr/lib/bigtop-utils/bigtop-detect-javahome
export HADOOP_HOME=\${HADOOP_HOME:-$LIB_HADOOP}
-export HADOOP_CONF_DIR=\${HADOOP_CONF_DIR:-$ETC_HADOOP/conf}
+export HADOOP_CONF_DIR=\${HADOOP_CONF_DIR:-$NP_ETC_HADOOP/conf}
export FLINK_HOME=\${FLINK_HOME:-$LIB_DIR}
-export FLINK_CONF_DIR=\${FLINK_CONF_DIR:-$ETC_FLINK/conf.dist}
+export FLINK_CONF_DIR=\${FLINK_CONF_DIR:-$NP_ETC_FLINK/conf}
export FLINK_LOG_DIR=\${FLINK_LOG_DIR:-/var/log/flink-cli}
exec $LIB_DIR/bin/flink "\$@"
diff --git a/bigtop-packages/src/rpm/flink/SPECS/flink.spec
b/bigtop-packages/src/rpm/flink/SPECS/flink.spec
index c7243325e..818d71506 100644
--- a/bigtop-packages/src/rpm/flink/SPECS/flink.spec
+++ b/bigtop-packages/src/rpm/flink/SPECS/flink.spec
@@ -23,7 +23,6 @@
%define etc_flink %{parent_dir}/etc/%{flink_name}
%define usr_lib_hadoop %{parent_dir}/usr/lib/hadoop
-%define etc_hadoop %{parent_dir}/etc/hadoop
%define bin_dir %{parent_dir}/%{_bindir}
%define man_dir %{parent_dir}/%{_mandir}
@@ -139,8 +138,7 @@ sh -x %{SOURCE2} \
--lib-dir=%{usr_lib_flink} \
--bin-dir=%{bin_dir} \
--lib-hadoop=%{usr_lib_hadoop} \
- --etc-flink=%{etc_flink} \
- --etc-hadoop=%{etc_hadoop}
+ --etc-flink=%{etc_flink}
for service in %{flink_services}
do
