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.

Sign up for GitHub

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

Jump to bottom

Some tweaks for performance comparison #9819

Merged
merged 2 commits into from
Mar 24, 2020
Merged

Some tweaks for performance comparison #9819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d396a7c
Some tweaks for performance comparison
akuzm Mar 23, 2020
fe1eb69
Update perf-comparison-tweaks-config.xml
akuzm Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 3 additions & 35 deletions docker/test/performance-comparison/compare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,7 @@ stage=${stage:-}
function configure
{
# Use the new config for both servers, so that we can change it in a PR.

mkdir right/config/users.d ||:
mkdir right/config/config.d ||:

# FIXME delete these two configs when the performance.tgz with configs rolls out.
cat > right/config/config.d/zz-perf-test-tweaks-config.xml <<EOF
<yandex>
<logger>
<console>true</console>
</logger>
<text_log remove="remove">
<table remove="remove"/>
</text_log>
<use_uncompressed_cache>0</use_uncompressed_cache>
<!--1 GB-->
<uncompressed_cache_size>1000000000</uncompressed_cache_size>
</yandex>
EOF

cat > right/config/users.d/zz-perf-test-tweaks-users.xml <<EOF
<yandex>
<profiles>
<default>
<query_profiler_real_time_period_ns>10000000</query_profiler_real_time_period_ns>
<query_profiler_cpu_time_period_ns>0</query_profiler_cpu_time_period_ns>
<allow_introspection_functions>1</allow_introspection_functions>
<log_queries>1</log_queries>
</default>
</profiles>
</yandex>
EOF

rm right/config/config.d/text_log.xml ||:

cp -rv right/config left ||:

sed -i 's/<tcp_port>9000/<tcp_port>9001/g' left/config/config.xml
Expand Down Expand Up @@ -242,7 +209,8 @@ done
rm ./*.{rep,svg} test-times.tsv test-dump.tsv unstable.tsv unstable-query-ids.tsv unstable-query-metrics.tsv changed-perf.tsv unstable-tests.tsv unstable-queries.tsv bad-tests.tsv slow-on-client.tsv all-queries.tsv ||:

right/clickhouse local --query "
create table queries engine Memory as select
create table queries engine File(TSVWithNamesAndTypes, 'queries.tsv')
as select
replaceAll(_file, '-report.tsv', '') test,

-- FIXME Comparison mode doesn't make sense for queries that complete
Expand Down Expand Up @@ -382,7 +350,7 @@ create table stacks engine File(TSV, 'stacks.rep') as
join unstable_query_runs using query_id
group by query, trace
;
" ||:
" 2>> report-errors.txt ||:

IFS=$'\n'
for query in $(cut -d' ' -f1 stacks.rep | sort | uniq)
Expand Down
3 changes: 1 addition & 2 deletions docker/test/performance-comparison/config/config.d/perf-comparison-tweaks-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<collect_interval_milliseconds>1000</collect_interval_milliseconds>
</metric_log>

<use_uncompressed_cache>0</use_uncompressed_cache>
<!--64 GiB-->
<use_uncompressed_cache>1</use_uncompressed_cache>
<uncompressed_cache_size>1000000000</uncompressed_cache_size>
</yandex>
2 changes: 2 additions & 0 deletions docker/test/performance-comparison/report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ def print_test_times():

print_test_times()

# Add the errors reported by various steps of comparison script
report_errors += tsvRows('report-errors.txt')
if len(report_errors):
print(tableStart('Errors while building the report'))
print(tableHeader(['Error']))
Expand Down