Skip to content

Commit 66233b2

Browse files
authoredOct 28, 2024
[Enhancement] Upgrade async-profiler to 3.0 (StarRocks#52230)
Signed-off-by: gengjun-git <gengjun@starrocks.com>
1 parent 465d599 commit 66233b2

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed
 

‎build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ if [ ${BUILD_FE} -eq 1 -o ${BUILD_SPARK_DPP} -eq 1 ]; then
519519
cp -r -p ${STARROCKS_HOME}/webroot/* ${STARROCKS_OUTPUT}/fe/webroot/
520520
cp -r -p ${STARROCKS_HOME}/fe/spark-dpp/target/spark-dpp-*-jar-with-dependencies.jar ${STARROCKS_OUTPUT}/fe/spark-dpp/
521521
cp -r -p ${STARROCKS_HOME}/fe/hive-udf/target/hive-udf-1.0.0.jar ${STARROCKS_OUTPUT}/fe/hive-udf/
522-
cp -r -p ${STARROCKS_THIRDPARTY}/installed/async-profiler/* ${STARROCKS_OUTPUT}/fe/bin/
522+
cp -r -p ${STARROCKS_THIRDPARTY}/installed/async-profiler ${STARROCKS_OUTPUT}/fe/bin/
523523
MSG="${MSG}${MSG_FE}"
524524
elif [ ${BUILD_SPARK_DPP} -eq 1 ]; then
525525
install -d ${STARROCKS_OUTPUT}/fe/spark-dpp/

‎fe/fe-core/src/main/java/com/starrocks/memory/ProcProfileCollector.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected void runAfterCatalogReady() {
7777

7878
private void collectMemProfile() {
7979
String fileName = MEM_FILE_NAME_PREFIX + currentTimeString() + ".html";
80-
collectProfile(StarRocksFE.STARROCKS_HOME_DIR + "/bin/profiler.sh",
80+
collectProfile(StarRocksFE.STARROCKS_HOME_DIR + "/bin/async-profiler/bin/asprof",
8181
"-e", "alloc",
8282
"-d", String.valueOf(Config.proc_profile_collect_time_s),
8383
"-f", profileLogDir + "/" + fileName,
@@ -92,7 +92,7 @@ private void collectMemProfile() {
9292

9393
private void collectCPUProfile() {
9494
String fileName = CPU_FILE_NAME_PREFIX + currentTimeString() + ".html";
95-
collectProfile(StarRocksFE.STARROCKS_HOME_DIR + "/bin/profiler.sh",
95+
collectProfile(StarRocksFE.STARROCKS_HOME_DIR + "/bin/async-profiler/bin/asprof",
9696
"-e", "cpu",
9797
"-d", String.valueOf(Config.proc_profile_collect_time_s),
9898
"-f", profileLogDir + "/" + fileName,

‎thirdparty/build-thirdparty.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1227,8 +1227,8 @@ build_datasketches() {
12271227
build_async_profiler() {
12281228
check_if_source_exist $ASYNC_PROFILER_SOURCE
12291229
mkdir -p $TP_INSTALL_DIR/async-profiler
1230-
cp -r $TP_SOURCE_DIR/$ASYNC_PROFILER_SOURCE/build $TP_INSTALL_DIR/async-profiler
1231-
cp -r $TP_SOURCE_DIR/$ASYNC_PROFILER_SOURCE/profiler.sh $TP_INSTALL_DIR/async-profiler
1230+
cp -r $TP_SOURCE_DIR/$ASYNC_PROFILER_SOURCE/bin $TP_INSTALL_DIR/async-profiler
1231+
cp -r $TP_SOURCE_DIR/$ASYNC_PROFILER_SOURCE/lib $TP_INSTALL_DIR/async-profiler
12321232
}
12331233

12341234
# fiu

‎thirdparty/vars-aarch64.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ HYPERSCAN_SOURCE="hyperscan-5.3.0.aarch64"
4040
HYPERSCAN_MD5SUM="ef337257bde6583242a739fab6fb161f"
4141

4242
# async-profiler
43-
ASYNC_PROFILER_DOWNLOAD="https://github.com/async-profiler/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-arm64.tar.gz"
44-
ASYNC_PROFILER_NAME="async-profiler-2.9-linux-arm64.tar.gz"
45-
ASYNC_PROFILER_SOURCE="async-profiler-2.9-linux-arm64"
46-
ASYNC_PROFILER_MD5SUM="d31a70d2c176146a46dffc15948040ed"
43+
ASYNC_PROFILER_DOWNLOAD="https://github.com/async-profiler/async-profiler/releases/download/v3.0/async-profiler-3.0-linux-arm64.tar.gz"
44+
ASYNC_PROFILER_NAME="async-profiler-3.0-linux-arm64.tar.gz"
45+
ASYNC_PROFILER_SOURCE="async-profiler-3.0-linux-arm64"
46+
ASYNC_PROFILER_MD5SUM="27ba04b14b84b9709aa97fb08737d13d"
4747

4848
# jindosdk for Aliyun OSS
4949
JINDOSDK_DOWNLOAD="https://cdn-thirdparty.starrocks.com/jindosdk-4.6.8-linux-el7-aarch64.tar.gz"

‎thirdparty/vars-x86_64.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ HYPERSCAN_SOURCE="hyperscan-5.4.0"
4040
HYPERSCAN_MD5SUM="65e08385038c24470a248f6ff2fa379b"
4141

4242
# async-profiler
43-
ASYNC_PROFILER_DOWNLOAD="https://github.com/async-profiler/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-x64.tar.gz"
44-
ASYNC_PROFILER_NAME="async-profiler-2.9-linux-x64.tar.gz"
45-
ASYNC_PROFILER_SOURCE="async-profiler-2.9-linux-x64"
46-
ASYNC_PROFILER_MD5SUM="29127cee36b7acf069d31603b4558361"
43+
ASYNC_PROFILER_DOWNLOAD="https://github.com/async-profiler/async-profiler/releases/download/v3.0/async-profiler-3.0-linux-x64.tar.gz"
44+
ASYNC_PROFILER_NAME="async-profiler-3.0-linux-x64.tar.gz"
45+
ASYNC_PROFILER_SOURCE="async-profiler-3.0-linux-x64"
46+
ASYNC_PROFILER_MD5SUM="618ef8c256103d3170cf2cddc4fe3fe2"
4747

4848
# jindosdk for Aliyun OSS
4949
JINDOSDK_DOWNLOAD="https://cdn-thirdparty.starrocks.com/jindosdk-4.6.8-linux.tar.gz"

0 commit comments

Comments
 (0)
Please sign in to comment.