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.

Sign up for GitHub

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

Jump to bottom

ref(clickhouse): update versions and add 24.3 #6246

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

ref(clickhouse): update versions and add 24.3 #6246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fef93dd
ref(clickhouse): update versions and add 24.3
MeredithAnya Aug 28, 2024
f7ea7cd
fix test, update CLICKHOUSE_SERVER_MIN_VERSION
MeredithAnya Nov 20, 2024
a1088bf
update test
MeredithAnya Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ jobs:
version:
[
"23.8.11.29.altinitystable",
"24.3.5.47.altinitystable",
]

steps:
Expand Down
1 change: 1 addition & 0 deletions snuba/clusters/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class ClickhouseClientSettings(Enum):
"replication_alter_partitions_sync": 2,
"mutations_sync": 2,
"database_atomic_wait_for_drop_and_detach_synchronously": 1,
"allow_suspicious_primary_key": 1,
Copy link
Member Author

@MeredithAnya MeredithAnya Nov 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@onkar @mcannizz this setting is to get around the problems in the EAP tables run into issue due to ClickHouse/ClickHouse#61399, I think we discussed before that would should actually fix this migration instead of allowing this setting, but this does seem to work incase we need it for temporary backwards compatibility.

},
10000,
)
Expand Down
8 changes: 4 additions & 4 deletions snuba/migrations/clickhouse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLICKHOUSE_SERVER_MIN_VERSION = "21.8.12.29"
# Note: 21.8.12.29 and 21.8.13.1 are used in self-hosted builds
# even though SaaS clusters are all on 22.8 or above
CLICKHOUSE_SERVER_MAX_VERSION = "23.8.11.29"
CLICKHOUSE_SERVER_MIN_VERSION = "23.8.11.29"
# Note: SaaS, self-hosted, and sentry dev
# environements should all be on 23.8.11.29
CLICKHOUSE_SERVER_MAX_VERSION = "24.3.5.47"
7 changes: 6 additions & 1 deletion tests/admin/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,12 @@ def test_query_trace_bad_query(admin_api: FlaskClient) -> None:
)
assert response.status_code == 400
data = json.loads(response.data)
assert "Exception: Missing columns" in data["error"]["message"]
# error message is different in CH versions 23.8 and 24.3
assert (
"Exception: Unknown expression or function identifier"
in data["error"]["message"]
or "Exception: Missing columns" in data["error"]["message"]
)
assert "clickhouse" == data["error"]["type"]


Expand Down
Loading