This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 6478bc300 BIGTOP-4112. Don't specify PYSPARK_PYTHON (#1273)
6478bc300 is described below
commit 6478bc3006ba881a109ca55df3c27488c523eae8
Author: masatana <[email protected]>
AuthorDate: Tue May 28 17:29:43 2024 +0900
BIGTOP-4112. Don't specify PYSPARK_PYTHON (#1273)
(cherry picked from commit 472eecad0d2701c078fc2d82f306343f378aa145)
---
bigtop-packages/src/common/spark/install_spark.sh | 4 +---
bigtop-packages/src/rpm/spark/SPECS/spark.spec | 14 --------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/bigtop-packages/src/common/spark/install_spark.sh
b/bigtop-packages/src/common/spark/install_spark.sh
index a8165c430..a320cb69a 100644
--- a/bigtop-packages/src/common/spark/install_spark.sh
+++ b/bigtop-packages/src/common/spark/install_spark.sh
@@ -182,8 +182,6 @@ cat > $PREFIX/$BIN_DIR/pyspark <<EOF
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
-export PYSPARK_PYTHON=python
-
exec $LIB_DIR/bin/pyspark "\$@"
EOF
chmod 755 $PREFIX/$BIN_DIR/pyspark
@@ -224,4 +222,4 @@ pushd $PREFIX/$LIB_DIR/external/lib
for j in $(ls *.jar); do
ln -s $j $(echo $j | sed -n 's/\(.*\)\(_.\+\)\(.jar\)/\1\3/p')
done
-popd
\ No newline at end of file
+popd
diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec
b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
index f42f58be3..0d9177ff0 100644
--- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec
+++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
@@ -181,19 +181,6 @@ bash $RPM_SOURCE_DIR/do-component-build
%__rm -rf $RPM_BUILD_ROOT
%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
-%if 0%{?rhel} >= 8
-PYSPARK_PYTHON=python2 bash $RPM_SOURCE_DIR/install_spark.sh \
- --build-dir=`pwd` \
- --source-dir=$RPM_SOURCE_DIR \
- --prefix=$RPM_BUILD_ROOT \
- --doc-dir=%{doc_spark} \
- --lib-dir=%{usr_lib_spark} \
- --var-dir=%{var_lib_spark} \
- --bin-dir=%{bin_dir} \
- --man-dir=%{man_dir} \
- --etc-default=%{etc_default} \
- --etc-spark=%{etc_spark}
-%else
bash $RPM_SOURCE_DIR/install_spark.sh \
--build-dir=`pwd` \
--source-dir=$RPM_SOURCE_DIR \
@@ -205,7 +192,6 @@ bash $RPM_SOURCE_DIR/install_spark.sh \
--man-dir=%{man_dir} \
--etc-default=%{etc_default} \
--etc-spark=%{etc_spark}
-%endif
%__rm -f $RPM_BUILD_ROOT/%{usr_lib_spark}/jars/hadoop-*.jar
