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

Support sql created named collections in Kafka Storage for librdkafka settings #59710

Merged
merged 1 commit into from Feb 28, 2024

Conversation

GrigoryPervakov
Copy link
Contributor

@GrigoryPervakov GrigoryPervakov commented Feb 7, 2024

Changelog category (leave one):

  • Improvement

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

Unify xml and sql created named collection behaviour in kafka storage.

Kafka storage have two types of parameters: storage parameters iteself and settings that would be passed to librdkafka.
Before changes storage paramets applied in both cases, but kafka settings loaded only if named collection was created with xml config.
Changes unifies named collection access and as a bonus allows use new xml named collection without server restart.

Example:
Consider following config

<clickhouse>
    <named_collections>
        <kafka_config_xml>
            <kafka_broker_list>kafka:19092</broker_list>
            <kafka_topic_list>topic_name</kafka_topic_list>
            <kafka_group_name>group</kafka_group_name>
            <kafka_format>JSONAsString</kafka_format>
            <kafka>
                <security_protocol>SASL_SSL</security_protocol>
                <sasl_mechanisms>'SCRAM-SHA-512</sasl_mechanisms>
                <sasl_username>username</sasl_username>
                <sasl_password>primary_secret_password</sasl_password>
            </kafka>
        </kafka_config_xml>
    </named_collections>
</clickhouse>

And queries like

CREATE NAMED COLLECTION kafka_config_sql AS
    kafka.security_protocol = 'SASL_SSL',
    kafka.sasl_mechanism = 'SCRAM-SHA-512',
    kafka.sasl_password = 'pswd',
    kafka.sasl_username = 'username
            
    kafka_broker_list = 'kafka:19092',
    kafka_topic_list = 'topic_name',
    kafka_group_name = 'group',
    kafka_format = 'JSONAsString'

CREATE TABLE test.kafka_sql (field String) ENGINE = Kafka(kafka_config_sql);
CREATE TABLE test.kafka_xml (field String) ENGINE = Kafka(kafka_config_xml);

Before changes table kafka_sql would not apply first 4 settings and would be unable to auth.
And also it wouldn't read default config, because of specified named collection, so right now kafka storage with sql created named collection is almost not configurable.

@CLAassistant
Copy link

CLAassistant commented Feb 7, 2024

CLA assistant check
All committers have signed the CLA.

src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@myrrc myrrc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
@kssenii kssenii self-assigned this Feb 26, 2024
@kssenii kssenii added the can be tested Allows running workflows for external contributors label Feb 26, 2024
@robot-ch-test-poll3 robot-ch-test-poll3 added the pr-improvement Pull request with some product improvements label Feb 26, 2024
@robot-ch-test-poll3
Copy link
Contributor

robot-ch-test-poll3 commented Feb 26, 2024

This is an automated comment for commit d3b82ab 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
ClickBenchRuns [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table✅ success
ClickHouse build checkBuilds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The cmake options can be found in the build log, grepping for cmake. Use these options and follow the general build process✅ 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. Integrational 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
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
SQLTestThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
SQLancerFuzzing tests that detect logical bugs with SQLancer tool✅ success
SqllogicRun clickhouse on the sqllogic test set against sqlite and checks that all statements are passed✅ 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
Check nameDescriptionStatus
A SyncThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS❌ failure
CI runningA meta-check that indicates the running CI. Normally, it's in success or pending state. The failed status indicates some problems with the PR⏳ pending
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests❌ failure
Mergeable CheckChecks if all other necessary checks are successful❌ failure

src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
src/Storages/Kafka/StorageKafka.cpp Outdated Show resolved Hide resolved
@KochetovNicolai KochetovNicolai merged commit 8dd08e9 into ClickHouse:master Feb 28, 2024
233 of 239 checks passed
@robot-clickhouse robot-clickhouse added the pr-synced-to-cloud The PR is synced to the cloud repo label Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
can be tested Allows running workflows for external contributors pr-improvement Pull request with some product improvements 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.

None yet

7 participants