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 client -s argument #61530

Merged
merged 3 commits into from Mar 21, 2024
Merged

Fix client -s argument #61530

merged 3 commits into from Mar 21, 2024

Conversation

Felixoid
Copy link
Member

@Felixoid Felixoid commented Mar 18, 2024

Changelog category (leave one):

  • Bug Fix (user-visible misbehavior in an official stable release)

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

Fix clickhouse-client -s argument, it was broken by defining it two times.

@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-bugfix Pull request with bugfix, not backported by default label Mar 18, 2024
@robot-clickhouse-ci-2
Copy link
Contributor

robot-clickhouse-ci-2 commented Mar 18, 2024

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

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

Check nameDescriptionStatus
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
Performance ComparisonMeasure changes in query performance. The performance test report is described in detail here. In square brackets are the optional part/total tests❌ failure
Successful checks
Check nameDescriptionStatus
A SyncThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
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
Bugfix validationChecks that either a new test (functional or integration) or there some changed tests that fail with the binary built on master branch✅ 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
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests✅ success
Mergeable CheckChecks if all other necessary checks are successful✅ success
PR CheckThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ 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

@Felixoid Felixoid changed the title Fix client s Fix client -s argument Mar 18, 2024
@antaljanosbenjamin antaljanosbenjamin self-assigned this Mar 18, 2024
Copy link
Member

@antaljanosbenjamin antaljanosbenjamin left a comment

Choose a reason for hiding this comment

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

The changes looks good, I only have two small comments:

  1. Can we add a test with -no-secure also? If it requires additional changes apart from adding a single line to a stateless test, then it might not worth it.
  2. The changelog item I think could be improved to let the users know what the fix about without opening a PR.

@Felixoid
Copy link
Member Author

The best I can think of is to add $CLICKHOUSE_CLIENT --no-secure -q "SELECT 0;" in the beginning. Would it work? Because more complex logic is far behind a simple fix.

@antaljanosbenjamin
Copy link
Member

The best I can think of is to add $CLICKHOUSE_CLIENT --no-secure -q "SELECT 0;" in the beginning. Would it work? Because more complex logic is far behind a simple fix.

I was thinking about the same line. Let's try. I think it should succeed, but I can be wrong.

@Felixoid
Copy link
Member Author

A link for the reference #59075

@Felixoid
Copy link
Member Author

sadly, fast tests are built w/o netSSL

@Felixoid
Copy link
Member Author

Yaaaaaay!

2024-03-19 13:20:28 00505_secure: [ OK ] 0.53 sec.
https://github.com/ClickHouse/ClickHouse/actions/runs/8341963627/job/22831139617?pr=61530#step:8:9113

@Felixoid
Copy link
Member Author

Pushed again to see if the bugfix check is fixed in #61607

@Felixoid Felixoid merged commit 5b0610b into master Mar 21, 2024
238 of 250 checks passed
@Felixoid Felixoid deleted the fix-client-s branch March 21, 2024 09:17
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-synced-to-cloud The PR is synced to the cloud repo label Mar 21, 2024
robot-ch-test-poll added a commit that referenced this pull request Mar 21, 2024
…44ae761a9f496d71a60872f1e11da

Cherry pick #61530 to 24.1: Fix client `-s` argument
robot-clickhouse added a commit that referenced this pull request Mar 21, 2024
robot-ch-test-poll added a commit that referenced this pull request Mar 21, 2024
…44ae761a9f496d71a60872f1e11da

Cherry pick #61530 to 24.2: Fix client `-s` argument
robot-clickhouse added a commit that referenced this pull request Mar 21, 2024
@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 Mar 21, 2024
robot-clickhouse added a commit that referenced this pull request Mar 21, 2024
Backport #61530 to 24.1: Fix client `-s` argument
Felixoid added a commit that referenced this pull request Mar 24, 2024
Backport #61530 to 24.2: Fix client `-s` argument
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-bugfix Pull request with bugfix, not backported by default pr-synced-to-cloud The PR is synced to the cloud repo v24.1-must-backport v24.2-must-backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants