Skip to content

Fix docker entrypoint in case http_port is not in the config#22132

Merged
alesapin merged 1 commit intoClickHouse:masterfrom
devwout:fix-docker-entrypoint
Mar 29, 2021
Merged

Fix docker entrypoint in case http_port is not in the config#22132
alesapin merged 1 commit intoClickHouse:masterfrom
devwout:fix-docker-entrypoint

Conversation

@devwout
Copy link
Copy Markdown
Contributor

@devwout devwout commented Mar 25, 2021

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):

  • Bug Fix

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

Fix docker entrypoint in case http_port is not in the config.

...

Detailed description / Documentation draft:

...

By adding documentation, you'll allow users to try your new feature immediately, not when someone else will have time to document it later. Documentation is necessary for all features that affect user experience in any way. You can add brief documentation draft above, or add documentation right into your patch as Markdown files in docs folder.

If you are doing this for the first time, it's recommended to read the lightweight Contributing to ClickHouse Documentation guide first.

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

`http_port` can be removed from the configuration when serving HTTP is
not desired. When it is not present, `extract-from-config` will fail,
which will prevent the server from starting.

Only fetch it when it is required for database initialization.
@robot-clickhouse robot-clickhouse added the pr-bugfix Pull request with bugfix, not backported by default label Mar 25, 2021
@filimonov
Copy link
Copy Markdown
Contributor

Vs #22102 ?

@devwout
Copy link
Copy Markdown
Contributor Author

devwout commented Mar 26, 2021

Vs #22102 ?

Seems I went straight for the fix instead of checking the bug reports and open PRs 🙈 . If the other PR is preferred, I can trim it down to only solve the problem with missing http_port.

@devwout devwout force-pushed the fix-docker-entrypoint branch from 10c21e2 to 6fe2649 Compare March 29, 2021 10:14
@devwout devwout changed the title Fix docker entrypoint in case some keys are not in the config Fix docker entrypoint in case http_port is not in the config Mar 29, 2021
@devwout
Copy link
Copy Markdown
Contributor Author

devwout commented Mar 29, 2021

Reduced the PR to only contain the fix for config without http_port.

Copy link
Copy Markdown
Member

@alesapin alesapin left a comment

Choose a reason for hiding this comment

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

Ok, this fix doesn't change a lot but also doesn't break anything.

@alesapin
Copy link
Copy Markdown
Member

Tests not required.

@alesapin alesapin self-assigned this Mar 29, 2021
@alesapin alesapin merged commit 581ab43 into ClickHouse:master Mar 29, 2021
robot-clickhouse pushed a commit that referenced this pull request Mar 29, 2021
robot-clickhouse pushed a commit that referenced this pull request Mar 29, 2021
alesapin added a commit that referenced this pull request Mar 30, 2021
Backport #22132 to 21.2: Fix docker entrypoint in case http_port is not in the config
alesapin added a commit that referenced this pull request Mar 30, 2021
Backport #22132 to 21.3: Fix docker entrypoint in case http_port is not in the config
@devwout devwout deleted the fix-docker-entrypoint branch April 1, 2021 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr-bugfix Pull request with bugfix, not backported by default

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants