This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch doris-for-zhongjin
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 629d2970e012eab05e655e51e88a6e567652a920
Author: morningman <morning...@163.com>
AuthorDate: Tue Apr 4 17:36:53 2023 +0800
[zhongjin] fix compile bug and modify scripts
---
be/src/io/fs/err_utils.cpp | 8 ++++----
bin/start_be.sh | 7 ++++++-
bin/start_fe.sh | 4 ++++
build.sh | 1 +
thirdparty/build-thirdparty-for-tbds.sh | 4 ++--
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/be/src/io/fs/err_utils.cpp b/be/src/io/fs/err_utils.cpp
index d01c7e7488..341776ab3b 100644
--- a/be/src/io/fs/err_utils.cpp
+++ b/be/src/io/fs/err_utils.cpp
@@ -40,10 +40,10 @@ std::string hdfs_error() {
char buf[1024];
ss << "(" << errno << "), " << strerror_r(errno, buf, 1024) << ")";
#ifdef USE_HADOOP_HDFS
- char* root_cause = hdfsGetLastExceptionRootCause();
- if (root_cause != nullptr) {
- ss << ", reason: " << root_cause;
- }
+ // char* root_cause = hdfsGetLastExceptionRootCause();
+ // if (root_cause != nullptr) {
+ // ss << ", reason: " << root_cause;
+ // }
#else
ss << ", reason: " << hdfsGetLastError();
#endif
diff --git a/bin/start_be.sh b/bin/start_be.sh
index 443a76340e..ce33ecf418 100644
--- a/bin/start_be.sh
+++ b/bin/start_be.sh
@@ -283,12 +283,17 @@ else
fi
# libhdfs
-export
LD_LIBRARY_PATH=${DORIS_HOME}/lib/hadoop-tbds/lib/native/:$LD_LIBRARY_PATH
+export
LD_LIBRARY_PATH=${DORIS_HOME}/lib/hadoop_tbds/lib/native/:$LD_LIBRARY_PATH
echo "CLASSPATH: ${CLASSPATH}"
echo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
echo "LIBHDFS_OPTS: ${LIBHDFS_OPTS}"
+# for tbds test
+export
hadoop_security_authentication_tbds_secureid=G1xWGvstKJnnuhXeFnOl4Ui2nRiDeEY4IFtB
+export
hadoop_security_authentication_tbds_securekey=pjIrpXwZqdY5Xha5jAiiwnuAqIJNPajS
+export hadoop_security_authentication_tbds_username=admin
+
# see
https://github.com/apache/doris/blob/master/docs/zh-CN/community/developer-guide/debug-tool.md#jemalloc-heap-profile
export
JEMALLOC_CONF="percpu_arena:percpu,background_thread:true,metadata_thp:auto,muzzy_decay_ms:30000,dirty_decay_ms:30000,oversize_threshold:0,lg_tcache_max:16,prof_prefix:jeprof.out"
diff --git a/bin/start_fe.sh b/bin/start_fe.sh
index f8af11cf90..19a3431f1b 100755
--- a/bin/start_fe.sh
+++ b/bin/start_fe.sh
@@ -203,6 +203,10 @@ if [[ "${HELPER}" != "" ]]; then
HELPER="-helper ${HELPER}"
fi
+export
hadoop_security_authentication_tbds_secureid=G1xWGvstKJnnuhXeFnOl4Ui2nRiDeEY4IFtB
+export
hadoop_security_authentication_tbds_securekey=pjIrpXwZqdY5Xha5jAiiwnuAqIJNPajS
+export hadoop_security_authentication_tbds_username=admin
+
if [[ "${IMAGE_TOOL}" -eq 1 ]]; then
if [[ -n "${IMAGE_PATH}" ]]; then
${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}}
org.apache.doris.DorisFE -i "${IMAGE_PATH}"
diff --git a/build.sh b/build.sh
index bab521d6ca..7f173015ab 100755
--- a/build.sh
+++ b/build.sh
@@ -520,6 +520,7 @@ if [[ "${BUILD_FE}" -eq 1 ]]; then
rm -rf "${DORIS_OUTPUT}/fe/lib"/*
cp -r -p "${DORIS_HOME}/fe/fe-core/target/lib"/* "${DORIS_OUTPUT}/fe/lib"/
rm -f "${DORIS_OUTPUT}/fe/lib/palo-fe.jar"
+ rm -f "${DORIS_OUTPUT}/fe/lib/servlet-api-2.5.jar"
cp -r -p "${DORIS_HOME}/fe/fe-core/target/doris-fe.jar"
"${DORIS_OUTPUT}/fe/lib"/
cp -r -p "${DORIS_HOME}/docs/build/help-resource.zip"
"${DORIS_OUTPUT}/fe/lib"/
cp -r -p "${DORIS_HOME}/webroot/static" "${DORIS_OUTPUT}/fe/webroot"/
diff --git a/thirdparty/build-thirdparty-for-tbds.sh
b/thirdparty/build-thirdparty-for-tbds.sh
index 6d2598e19d..d4a5fda820 100755
--- a/thirdparty/build-thirdparty-for-tbds.sh
+++ b/thirdparty/build-thirdparty-for-tbds.sh
@@ -40,8 +40,8 @@ TBDS_HADOOP=hadoop-2.2.0.0-2041-tbds-5.2.0.1.tar.xz
THIRDPARTY_INSTALLED=installed-for-tbds-with-thrift13.tar.xz
DOWNLOAD_LINK=https://tencent-tbds-1308700295.cos.ap-beijing.myqcloud.com
-wget --no-check-certificate -q "${DOWNLOAD_LINK}/${THIRDPARTY_INSTALLED}" -O
"${TP_DIR}/${THIRDPARTY_INSTALLED}"
-wget --no-check-certificate -q "${DOWNLOAD_LINK}/${TBDS_HADOOP}" -O
"${TP_DIR}/${TBDS_HADOOP}"
+wget --no-check-certificate "${DOWNLOAD_LINK}/${THIRDPARTY_INSTALLED}" -O
"${TP_DIR}/${THIRDPARTY_INSTALLED}"
+wget --no-check-certificate "${DOWNLOAD_LINK}/${TBDS_HADOOP}" -O
"${TP_DIR}/${TBDS_HADOOP}"
tar xf "${TP_DIR}/${THIRDPARTY_INSTALLED}"
tar xf "${TP_DIR}/${TBDS_HADOOP}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
