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 infinite recursion when infering a proto schema with skip unsupported fields enabled #70697

Merged

Conversation

Algunenano
Copy link
Member

Changelog category (leave one):

  • Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Fix infinite recursion when infering a proto schema with skip unsupported fields enabled

The problem was that when skipping an unsupported field due to type recursion (supported in protobuf but not in CH type system) we didn't keep track of it anymore, so we would try to resolve it again and again. This would not happen with default settings (no skip unsupported) because an exception would be thrown in the first occurence.

Closes #70630

Documentation entry for user-facing changes

  • Documentation is written (mandatory for new features)

Information about CI checks: https://clickhouse.com/docs/en/development/continuous-integration/

CI Settings (Only check the boxes if you know what you are doing):

  • Allow: All Required Checks
  • Allow: Stateless tests
  • Allow: Stateful tests
  • Allow: Integration Tests
  • Allow: Performance tests
  • Allow: All Builds
  • Allow: batch 1, 2 for multi-batch jobs
  • Allow: batch 3, 4, 5, 6 for multi-batch jobs

  • Exclude: Style check
  • Exclude: Fast test
  • Exclude: All with ASAN
  • Exclude: All with TSAN, MSAN, UBSAN, Coverage
  • Exclude: All with aarch64, release, debug

  • Run only fuzzers related jobs (libFuzzer fuzzers, AST fuzzers, etc.)
  • Exclude: AST fuzzers

  • Do not test
  • Woolen Wolfdog
  • Upload binaries for special builds
  • Disable merge-commit
  • Disable CI cache

@robot-ch-test-poll4 robot-ch-test-poll4 added pr-critical-bugfix pr-must-backport Pull request should be backported intentionally. Use this label with great care! pr-must-backport-cloud labels Oct 15, 2024
@robot-ch-test-poll3
Copy link
Contributor

robot-ch-test-poll3 commented Oct 15, 2024

This is an automated comment for commit 94c6fab with description of existing statuses. It's updated for the latest CI running

✅ Click here to open a full report in a separate page

Successful checks
Check nameDescriptionStatus
AST fuzzerRuns randomly generated queries to catch program errors. The build type is optionally given in parenthesis. If it fails, ask a maintainer for help✅ success
BuildsThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
ClickBenchRuns [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table✅ success
Compatibility checkChecks that clickhouse binary runs on distributions with old libc versions. If it fails, ask a maintainer for help✅ success
Docker keeper imageThe check to build and optionally push the mentioned image to docker hub✅ success
Docker server imageThe check to build and optionally push the mentioned image to docker hub✅ success
Docs checkBuilds and tests the documentation✅ success
Fast testNormally this is the first check that is ran for a PR. It builds ClickHouse and runs most of stateless functional tests, omitting some. If it fails, further checks are not started until it is fixed. Look at the report to see which tests fail, then reproduce the failure locally as described here✅ success
Flaky testsChecks if new added or modified tests are flaky by running them repeatedly, in parallel, with more randomization. Functional tests are run 100 times with address sanitizer, and additional randomization of thread scheduling. Integration tests are run up to 10 times. If at least once a new test has failed, or was too long, this check will be red. We don't allow flaky tests, read the doc✅ success
Install packagesChecks that the built packages are installable in a clear environment✅ success
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests✅ success
Performance ComparisonMeasure changes in query performance. The performance test report is described in detail here. In square brackets are the optional part/total tests✅ success
Stateful testsRuns stateful functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc✅ success
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc✅ success
Stress testRuns stateless functional tests concurrently from several clients to detect concurrency-related errors✅ success
Style checkRuns a set of checks to keep the code style clean. If some of tests failed, see the related log from the report✅ success
Unit testsRuns the unit tests for different release types✅ success
Upgrade checkRuns stress tests on server version from last release and then tries to upgrade it to the version from the PR. It checks if the new server can successfully startup without any errors, crashes or sanitizer asserts✅ success

@alexey-milovidov alexey-milovidov self-assigned this Oct 16, 2024
@alexey-milovidov alexey-milovidov added this pull request to the merge queue Oct 16, 2024
@alexey-milovidov
Copy link
Member

Thanks! We can also use depth-counting and checkStackSize (possibly invoked every n of depth levels) as the last protection - it will help not only from infinite recursion but also from very deep protobufs.

Merged via the queue into ClickHouse:master with commit f9697bf Oct 16, 2024
210 checks passed
@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-synced-to-cloud The PR is synced to the cloud repo label Oct 16, 2024
robot-clickhouse-ci-2 added a commit that referenced this pull request Oct 16, 2024
…180ca42f2f8c33b8d70b106b864df

Cherry pick #70697 to 24.7: Fix infinite recursion when infering a proto schema with skip unsupported fields enabled
robot-clickhouse added a commit that referenced this pull request Oct 16, 2024
… schema with skip unsupported fields enabled
robot-clickhouse-ci-2 added a commit that referenced this pull request Oct 16, 2024
…180ca42f2f8c33b8d70b106b864df

Cherry pick #70697 to 24.8: Fix infinite recursion when infering a proto schema with skip unsupported fields enabled
robot-clickhouse added a commit that referenced this pull request Oct 16, 2024
… schema with skip unsupported fields enabled
robot-clickhouse-ci-2 added a commit that referenced this pull request Oct 16, 2024
…180ca42f2f8c33b8d70b106b864df

Cherry pick #70697 to 24.9: Fix infinite recursion when infering a proto schema with skip unsupported fields enabled
robot-clickhouse added a commit that referenced this pull request Oct 16, 2024
… schema with skip unsupported fields enabled
@robot-ch-test-poll robot-ch-test-poll added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Oct 16, 2024
robot-ch-test-poll1 added a commit that referenced this pull request Oct 16, 2024
Backport #70697 to 24.9: Fix infinite recursion when infering a proto schema with skip unsupported fields enabled
robot-clickhouse added a commit that referenced this pull request Oct 16, 2024
Backport #70697 to 24.8: Fix infinite recursion when infering a proto schema with skip unsupported fields enabled
robot-ch-test-poll1 added a commit that referenced this pull request Oct 16, 2024
Backport #70697 to 24.7: Fix infinite recursion when infering a proto schema with skip unsupported fields enabled
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-backports-created-cloud pr-critical-bugfix pr-must-backport Pull request should be backported intentionally. Use this label with great care! pr-must-backport-cloud pr-synced-to-cloud The PR is synced to the cloud repo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clickhouse crashes when generation protobuf schema with recursive fields
7 participants