pkg/cli: fix flaky TestZipIncludeAndExcludeFilesDataDriven test#162526
Merged
trunk-io[bot] merged 1 commit intocockroachdb:masterfrom Feb 6, 2026
Merged
pkg/cli: fix flaky TestZipIncludeAndExcludeFilesDataDriven test#162526trunk-io[bot] merged 1 commit intocockroachdb:masterfrom
trunk-io[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
The test was failing because the debug zip output now includes non-deterministic CPU profile files that weren't being filtered. Stored CPU profiles in the cpuprof/ directory have timestamped names like cpuprof.2026-01-27T08_53_56.910.67.pprof, and error files like cpu.pprof.err.txt are created when live CPU profiling fails during test execution. The debug zip has two mechanisms for collecting CPU profiles. Live CPU profiles are collected via collectCPUProfiles and stored as cpu.pprof. Stored CPU profiles are collected via collectFileList with FileType_CPU from the cpuprof/ directory. This fix adds regex patterns to trimNonDeterministicZipOutputFiles to filter out these files, similar to how other non-deterministic outputs like memprof, goroutine_dump, and job-related files are already handled. Fixes: cockroachdb#161849 Part of: CRDB-59115 Epic: none Release note: none
Member
Member
🔴 Sysbench [SQL, 3node, oltp_read_write]
Reproducebenchdiff binaries: mkdir -p benchdiff/9d5f581/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/9d5f581d483443be0bc62b67c3f729655f9440f5/bin/pkg_sql_tests benchdiff/9d5f581/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/9d5f581/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/75d90d9/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/75d90d9d6be36e83f23a3916b3f353ec892aa944/bin/pkg_sql_tests benchdiff/75d90d9/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/75d90d9/bin/1058449141/cockroachdb_cockroach_pkg_sql_testsbenchdiff command: benchdiff --run=^BenchmarkSysbench/SQL/3node/oltp_read_write$ --old=75d90d9 --new=9d5f581 ./pkg/sql/tests⚪ Sysbench [KV, 3node, oltp_read_only]
Reproducebenchdiff binaries: mkdir -p benchdiff/9d5f581/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/9d5f581d483443be0bc62b67c3f729655f9440f5/bin/pkg_sql_tests benchdiff/9d5f581/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/9d5f581/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/75d90d9/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/75d90d9d6be36e83f23a3916b3f353ec892aa944/bin/pkg_sql_tests benchdiff/75d90d9/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/75d90d9/bin/1058449141/cockroachdb_cockroach_pkg_sql_testsbenchdiff command: benchdiff --run=^BenchmarkSysbench/KV/3node/oltp_read_only$ --old=75d90d9 --new=9d5f581 ./pkg/sql/tests⚪ Sysbench [KV, 3node, oltp_write_only]
Reproducebenchdiff binaries: mkdir -p benchdiff/9d5f581/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/9d5f581d483443be0bc62b67c3f729655f9440f5/bin/pkg_sql_tests benchdiff/9d5f581/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/9d5f581/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/75d90d9/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/75d90d9d6be36e83f23a3916b3f353ec892aa944/bin/pkg_sql_tests benchdiff/75d90d9/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/75d90d9/bin/1058449141/cockroachdb_cockroach_pkg_sql_testsbenchdiff command: benchdiff --run=^BenchmarkSysbench/KV/3node/oltp_write_only$ --old=75d90d9 --new=9d5f581 ./pkg/sql/testsArtifactsdownload: mkdir -p new
gcloud storage cp gs://cockroach-microbench-ci/artifacts/9d5f581d483443be0bc62b67c3f729655f9440f5/21704924747-1/\* new/
mkdir -p old
gcloud storage cp gs://cockroach-microbench-ci/artifacts/75d90d9d6be36e83f23a3916b3f353ec892aa944/21704924747-1/\* old/built with commit: 9d5f581d483443be0bc62b67c3f729655f9440f5 |
aa-joshi
approved these changes
Feb 6, 2026
Contributor
aa-joshi
left a comment
There was a problem hiding this comment.
Please verify the CI unit test failure.
@aa-joshi reviewed 1 file and all commit messages, and made 1 comment.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @dhartunian and @visheshbardia).
Contributor
Author
|
CI test failure was intermittent. Its fixed now. |
Contributor
Author
|
TFTR! |
|
Bors is deprecated. Please use |
Contributor
Author
|
/trunk merge |
Contributor
|
😎 Merged successfully - details. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The test was failing because the debug zip output now includes
non-deterministic CPU profile files that weren't being filtered.
Stored CPU profiles in the cpuprof/ directory have timestamped names
like cpuprof.2026-01-27T08_53_56.910.67.pprof, and error files like
cpu.pprof.err.txt are created when live CPU profiling fails during
test execution.
The debug zip has two mechanisms for collecting CPU profiles. Live
CPU profiles are collected via collectCPUProfiles and stored as
cpu.pprof. Stored CPU profiles are collected via collectFileList
with FileType_CPU from the cpuprof/ directory.
This fix adds regex patterns to trimNonDeterministicZipOutputFiles
to filter out these files, similar to how other non-deterministic
outputs like memprof, goroutine_dump, and job-related files are
already handled.
Fixes: #161849
Part of: CRDB-59115
Epic: none
Release note: none