feat: add support for coordinator schemas #28031
+292
−73
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <clickhouse> | ||
| <tcp_port>9001</tcp_port> | ||
| <remote_servers> | ||
| <posthog> | ||
| <shard> | ||
| <replica> | ||
| <host>clickhouse</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog> | ||
| <posthog_single_shard> | ||
| <shard> | ||
| <replica> | ||
| <host>clickhouse</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog_single_shard> | ||
| <posthog_migrations> | ||
| <shard> | ||
| <replica> | ||
| <host>clickhouse</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| <shard> | ||
| <replica> | ||
| <host>clickhouse-coordinator</host> | ||
| <port>9001</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog_migrations> | ||
| </remote_servers> | ||
|
|
||
| <macros> | ||
| <shard>02</shard> | ||
|
There was a problem hiding this comment. logic: shard number '02' may conflict with existing shards if not carefully coordinated across the cluster |
||
| <replica>coord</replica> | ||
| <hostClusterType>online</hostClusterType> | ||
| <hostClusterRole>coordinator</hostClusterRole> | ||
| </macros> | ||
| </clickhouse> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <clickhouse> | ||
| <tcp_port>9000</tcp_port> | ||
|
|
||
| <remote_servers> | ||
| <posthog> | ||
| <shard> | ||
| <replica> | ||
| <host>localhost</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog> | ||
| <posthog_single_shard> | ||
| <shard> | ||
| <replica> | ||
| <host>localhost</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog_single_shard> | ||
| <posthog_migrations> | ||
| <shard> | ||
| <replica> | ||
| <host>localhost</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog_migrations> | ||
| </remote_servers> | ||
|
|
||
| <macros> | ||
| <shard>01</shard> | ||
| <replica>ch1</replica> | ||
| <hostClusterType>online</hostClusterType> | ||
| <hostClusterRole>worker</hostClusterRole> | ||
| </macros> | ||
| </clickhouse> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <clickhouse> | ||
| <tcp_port>9000</tcp_port> | ||
| <remote_servers> | ||
| <posthog> | ||
| <shard> | ||
| <replica> | ||
| <host>clickhouse</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog> | ||
| <posthog_single_shard> | ||
| <shard> | ||
| <replica> | ||
| <host>clickhouse</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog_single_shard> | ||
| <posthog_migrations> | ||
| <shard> | ||
| <replica> | ||
| <host>clickhouse</host> | ||
| <port>9000</port> | ||
| </replica> | ||
| </shard> | ||
| <shard> | ||
| <replica> | ||
| <host>clickhouse-coordinator</host> | ||
| <port>9001</port> | ||
| </replica> | ||
| </shard> | ||
| </posthog_migrations> | ||
| </remote_servers> | ||
|
|
||
| <macros> | ||
| <shard>01</shard> | ||
| <replica>ch1</replica> | ||
| <hostClusterType>online</hostClusterType> | ||
| <hostClusterRole>worker</hostClusterRole> | ||
| </macros> | ||
| </clickhouse> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,28 @@ | ||
| import logging | ||
|
|
||
| from infi.clickhouse_orm import migrations | ||
|
|
||
| from posthog.clickhouse.client.connection import NodeRole | ||
| from posthog.clickhouse.cluster import get_cluster | ||
| from posthog.settings.data_stores import CLICKHOUSE_MIGRATIONS_CLUSTER | ||
|
|
||
| logger = logging.getLogger("migrations") | ||
|
|
||
|
|
||
| def run_sql_with_exceptions(sql: str, settings=None, node_role: NodeRole = NodeRole.WORKER): | ||
| """ | ||
| migrations.RunSQL does not raise exceptions, so we need to wrap it in a function that does. | ||
| node_role is set to WORKER by default to keep compatibility with the old migrations. | ||
| """ | ||
|
|
||
| cluster = get_cluster(client_settings=settings, cluster=CLICKHOUSE_MIGRATIONS_CLUSTER) | ||
|
|
||
| def run_migration(): | ||
| if node_role == NodeRole.ALL: | ||
| logger.info(" Running migration on coordinators and workers") | ||
| return cluster.map_all_hosts(lambda client: client.execute(sql)).result() | ||
| else: | ||
|
There was a problem hiding this comment. logic: No error handling for failed migrations across nodes - could leave cluster in inconsistent state |
||
| logger.info(f" Running migration on {node_role.value.lower()}s") | ||
| return cluster.map_hosts_by_role(lambda client: client.execute(sql), node_role=node_role).result() | ||
|
|
||
| return migrations.RunPython(lambda _: run_migration()) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
style: consider deduplicating volume mounts between clickhouse and clickhouse-coordinator services using YAML anchors