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

chore: fix clickhouse sharding bootstrap #1393

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

loomts
Copy link
Contributor

@loomts loomts commented Jan 9, 2025

fix #1390

@loomts loomts requested review from sophon-zt, leon-inf, Y-Rookie and a team as code owners January 9, 2025 02:33
@loomts loomts merged commit 531153d into main Jan 9, 2025
19 checks passed
@loomts loomts deleted the bugfix/clickhouse-sharding-fqdn branch January 9, 2025 02:40
@loomts
Copy link
Contributor Author

loomts commented Jan 9, 2025

/cherry-pick release-1.0-beta

@apecloud-bot
Copy link
Collaborator

🤖 says: cherry pick action finished successfully 🎉!
See: https://github.com/apecloud/kubeblocks-addons/actions/runs/12683298609

apecloud-bot pushed a commit that referenced this pull request Jan 9, 2025
@loomts
Copy link
Contributor Author

loomts commented Jan 9, 2025

/cherry-pick release-0.9

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging addons/clickhouse/configs/00_default_overrides.xml.tpl
CONFLICT (content): Merge conflict in addons/clickhouse/configs/00_default_overrides.xml.tpl
Auto-merging addons/clickhouse/templates/cmpd-ch.yaml
CONFLICT (content): Merge conflict in addons/clickhouse/templates/cmpd-ch.yaml
error: could not apply 531153d... chore: fix clickhouse sharding bootstrap (#1393)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks-addons/actions/runs/12687328252

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Multi-shard Clickhouse cluster configuration not rendered properly
4 participants