This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 16b9c273a3f [fix](common) fix 'string pointer is null' crash on
LOG_DIR when star… (#60553)
16b9c273a3f is described below
commit 16b9c273a3f796167cf5b7bafe6e1b9a1cb82e49
Author: zhengyu <[email protected]>
AuthorDate: Fri Feb 6 17:24:25 2026 +0800
[fix](common) fix 'string pointer is null' crash on LOG_DIR when star…
(#60553)
…ting benchmark (#60139)
Uses LOG_DIR if set, otherwise config::sys_log_dir, else a relative
pipe_tracing directory. This prevents fmt from seeing a null string
pointer.
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---------
Signed-off-by: zhengyu <[email protected]>
---
be/CMakeLists.txt | 6 ++
be/src/io/tools/file_cache_microbench.cpp | 8 +-
be/src/pipeline/pipeline_tracing.h | 12 ++-
bin/start_file_cache_microbench.sh | 123 ++++++++++++++++++++++++++++++
4 files changed, 142 insertions(+), 7 deletions(-)
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index 71eec4cb1ce..a997369637d 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -838,6 +838,12 @@ endif()
option(BUILD_FILE_CACHE_MICROBENCH_TOOL "Build file cache mirobench Tool" OFF)
if (BUILD_FILE_CACHE_MICROBENCH_TOOL)
add_subdirectory(${SRC_DIR}/io/tools)
+ install(FILES
+ ${BASE_DIR}/../bin/start_file_cache_microbench.sh
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_WRITE GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE
+ DESTINATION ${OUTPUT_DIR}/bin)
endif()
option(BUILD_INDEX_TOOL "Build index tool" OFF)
diff --git a/be/src/io/tools/file_cache_microbench.cpp
b/be/src/io/tools/file_cache_microbench.cpp
index f85adedeb9f..e924fb077e0 100644
--- a/be/src/io/tools/file_cache_microbench.cpp
+++ b/be/src/io/tools/file_cache_microbench.cpp
@@ -2439,12 +2439,8 @@ int main(int argc, char* argv[]) {
};
periodiccally_log_thread = std::thread {periodiccally_log};
- try {
- HttpServer http_server(job_manager);
- http_server.start();
- } catch (const std::exception& e) {
- LOG(ERROR) << "Error in HTTP server: " << e.what();
- }
+ HttpServer http_server;
+ http_server.start(doris_home);
if (periodiccally_log_thread.joinable()) {
{
diff --git a/be/src/pipeline/pipeline_tracing.h
b/be/src/pipeline/pipeline_tracing.h
index fdcefc59a1e..d52c4d73b92 100644
--- a/be/src/pipeline/pipeline_tracing.h
+++ b/be/src/pipeline/pipeline_tracing.h
@@ -23,6 +23,7 @@
#include <parallel_hashmap/phmap.h>
#include <cstdint>
+#include <cstdlib>
#include <filesystem>
#include "common/atomic_shared_ptr.h"
@@ -84,7 +85,16 @@ private:
void _dump_timeslice();
void _update(std::function<void(QueryTracesMap&)>&& handler);
- std::filesystem::path _log_dir = fmt::format("{}/pipe_tracing",
getenv("LOG_DIR"));
+ std::filesystem::path _log_dir = []() {
+ const char* env_log_dir = std::getenv("LOG_DIR");
+ if (env_log_dir != nullptr && env_log_dir[0] != '\0') {
+ return std::filesystem::path(fmt::format("{}/pipe_tracing",
env_log_dir));
+ }
+ if (!config::sys_log_dir.empty()) {
+ return std::filesystem::path(fmt::format("{}/pipe_tracing",
config::sys_log_dir));
+ }
+ return std::filesystem::path("pipe_tracing");
+ }();
atomic_shared_ptr<QueryTracesMap> _data;
std::mutex _tg_lock; //TODO: use an lockfree DS
diff --git a/bin/start_file_cache_microbench.sh
b/bin/start_file_cache_microbench.sh
new file mode 100755
index 00000000000..4c5bc8a48fb
--- /dev/null
+++ b/bin/start_file_cache_microbench.sh
@@ -0,0 +1,123 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -eo pipefail
+
+curdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+DORIS_HOME="$(
+ cd "${curdir}/.."
+ pwd
+)"
+export DORIS_HOME
+
+export LOG_DIR="${DORIS_HOME}/log"
+
+# read from be.conf (for JAVA_HOME and other envs)
+while read -r line; do
+ envline="$(echo "${line}" |
+ sed 's/[[:blank:]]*=[[:blank:]]*/=/g' |
+ sed 's/^[[:blank:]]*//g' |
+ grep -E "^[[:upper:]]([[:upper:]]|_|[[:digit:]])*=" ||
+ true)"
+ envline="$(eval "echo ${envline}")"
+ if [[ "${envline}" == *"="* ]]; then
+ eval 'export "${envline}"'
+ fi
+done <"${DORIS_HOME}/conf/be.conf"
+
+jdk_version() {
+ local java_cmd="${1}"
+ local result
+ local IFS=$'\n'
+
+ if ! command -v "${java_cmd}" >/dev/null; then
+ result=no_java
+ return 1
+ else
+ local version
+ version="$("${java_cmd}" -Xms32M -Xmx32M -version 2>&1 | tr '\r' '\n'
| grep version | awk '{print $3}')"
+ version="${version//\"/}"
+ if [[ "${version}" =~ ^1\. ]]; then
+ result="$(echo "${version}" | awk -F '.' '{print $2}')"
+ else
+ result="$(echo "${version}" | awk -F '.' '{print $1}')"
+ fi
+ fi
+ echo "${result}"
+ return 0
+}
+
+setup_java_env() {
+ local java_version
+
+ if [[ -z "${JAVA_HOME}" ]]; then
+ return 1
+ fi
+
+ local jvm_arch='amd64'
+ if [[ "$(uname -m)" == 'aarch64' ]]; then
+ jvm_arch='aarch64'
+ fi
+ java_version="$(
+ set -e
+ jdk_version "${JAVA_HOME}/bin/java"
+ )"
+ if [[ "${java_version}" -gt 8 ]]; then
+ export
LD_LIBRARY_PATH="${JAVA_HOME}/lib/server:${JAVA_HOME}/lib:${LD_LIBRARY_PATH}"
+ if [[ "$(uname -s)" == 'Darwin' ]]; then
+ export
DYLD_LIBRARY_PATH="${JAVA_HOME}/lib/server:${JAVA_HOME}/lib:${DYLD_LIBRARY_PATH}"
+ fi
+ elif [[ -d "${JAVA_HOME}/jre" ]]; then
+ export
LD_LIBRARY_PATH="${JAVA_HOME}/jre/lib/${jvm_arch}/server:${JAVA_HOME}/jre/lib/${jvm_arch}:${LD_LIBRARY_PATH}"
+ if [[ "$(uname -s)" == 'Darwin' ]]; then
+ export
DYLD_LIBRARY_PATH="${JAVA_HOME}/jre/lib/server:${JAVA_HOME}/jre/lib:${DYLD_LIBRARY_PATH}"
+ fi
+ else
+ export
LD_LIBRARY_PATH="${JAVA_HOME}/lib/${jvm_arch}/server:${JAVA_HOME}/lib/${jvm_arch}:${LD_LIBRARY_PATH}"
+ if [[ "$(uname -s)" == 'Darwin' ]]; then
+ export
DYLD_LIBRARY_PATH="${JAVA_HOME}/lib/server:${JAVA_HOME}/lib:${DYLD_LIBRARY_PATH}"
+ fi
+ fi
+}
+
+setup_java_env || true
+
+if [[ -z "${JAVA_HOME}" ]]; then
+ echo "The JAVA_HOME environment variable is not set correctly"
+ echo "This environment variable is required to run this program"
+ echo "Note: JAVA_HOME should point to a JDK and not a JRE"
+ echo "You can set JAVA_HOME in the be.conf configuration file"
+ exit 1
+fi
+
+java_version="$(
+ set -e
+ jdk_version "${JAVA_HOME}/bin/java"
+)"
+if [[ "${java_version}" -ne 17 ]]; then
+ echo "ERROR: The jdk_version is ${java_version}, it must be 17."
+ exit 1
+fi
+
+
+JEMALLOC_CONF="percpu_arena:percpu,background_thread:true,metadata_thp:auto,muzzy_decay_ms:5000,dirty_decay_ms:5000,oversize_threshold:0,prof:true,lg_prof_interval:30,lg_prof_sample:19,prof_final:false,prof_active:true"
+JEMALLOC_PROF_PRFIX="jeprofile_doris_cloud"
+
+export JEMALLOC_CONF="${JEMALLOC_CONF},prof_prefix:${JEMALLOC_PROF_PRFIX}"
+sysctl -w vm.max_map_count=2000000 && ulimit -n 65535 && ulimit -c unlimited
&& swapoff -a && export
ASAN_SYMBOLIZER_PATH=/var/local/ldb-toolchain/bin/llvm-symbolizer && nohup
./file_cache_microbench --port=8060 &
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
