Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Asan/Benchmark CI issue #968 #971

Merged
merged 1 commit into from
Jan 14, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .circleci/asan-config.yml
Original file line number Diff line number Diff line change
@@ -53,6 +53,8 @@ jobs:

declare -i status0=0
declare -i status1=0
mkdir test-results
mkdir test-testlogs

pushd src
bazel test //... --features=asan --test_timeout=500 --ui_event_filters=-info,-debug,-warning --test_output=errors | tee test_result.log; status0=${PIPESTATUS[0]}
@@ -61,8 +63,9 @@ jobs:
cp -r test-testlogs/ ../test-testlogs/
popd

bazel test //... --features=asan --test_timeout=500 --ui_event_filters=-info,-debug,-warning --test_output=errors | tee -a test_result.log; status1=${PIPESTATUS[0]}
sh ../devtools/rename-junit-xml.sh
# TODO
# bazel test //... --features=asan --test_timeout=500 --ui_event_filters=-info,-debug,-warning --test_output=errors | tee -a test_result.log; status1=${PIPESTATUS[0]}
# sh ../devtools/rename-junit-xml.sh

find bazel-testlogs/ -type f -name "test.log" -print0 | xargs -0 tar -cvzf test_logs.tar.gz

1 change: 1 addition & 0 deletions .circleci/benchmark-config.yml
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ jobs:
"python3 -m pip install -U pip && \
python3 -m pip install spu && \
cd /home/admin/dev/ && \
python3 -m pip install -r requirements-dev.txt && \
export PYTHONPATH="${PWD}:$PYTHONPATH" && \
bash .circleci/run-nn.sh" | tee benchmark_results.log
- run:
Original file line number Diff line number Diff line change
@@ -488,7 +488,8 @@ std::unique_ptr<brpc::Server> RunServer(const ServerOptions& options) {
return nullptr;
}

brpc::ServerOptions brpc_options;
// workaround fix
brpc::ServerOptions brpc_options = server->options();

if (options.brpc_ssl_options) {
*brpc_options.mutable_ssl_options() = options.brpc_ssl_options.value();