Skip to content

Commit e808038

Browse files
authored
chore: Test ClickHouse 25.3 (#7339)
Same as before, but with replays acceptance tests.
1 parent 7616b58 commit e808038

File tree

6 files changed

+29
-77
lines changed

6 files changed

+29
-77
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ jobs:
362362
-vv --cov . --cov-report="xml:.artifacts/snuba.coverage.xml"
363363
364364
- name: Run full tests
365-
# TODO: Adjust which changed files we care about
366365
if: needs.files-changed.outputs.api_changes == 'true'
367366
working-directory: sentry
368367
run: |
@@ -399,8 +398,8 @@ jobs:
399398
matrix:
400399
version:
401400
[
402-
"24.3.5.47.altinitystable",
403401
"24.8.11.51285.altinitystable",
402+
"25.3.6.10034.altinitystable",
404403
]
405404

406405
steps:
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<clickhouse>
2+
<users>
3+
<default>
4+
<password></password>
5+
<networks>
6+
<ip>::/0</ip>
7+
</networks>
8+
</default>
9+
</users>
10+
</clickhouse>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<clickhouse>
2+
<users>
3+
<default>
4+
<password></password>
5+
<networks>
6+
<ip>::/0</ip>
7+
</networks>
8+
</default>
9+
</users>
10+
</clickhouse>

devservices/clickhouse/users.xml

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,30 @@
11
<clickhouse>
2-
<!-- See also the files in users.d directory where the settings can be overridden. -->
3-
4-
<!-- Profiles of settings. -->
52
<profiles>
6-
<!-- Default settings. -->
73
<default>
8-
<allow_experimental_analyzer>0</allow_experimental_analyzer>
94
</default>
105

11-
<!-- Profile that allows only read queries. -->
126
<readonly>
137
<readonly>1</readonly>
148
</readonly>
159
</profiles>
1610

17-
<!-- Users and ACL. -->
1811
<users>
19-
<!-- If user name was not specified, 'default' user is used. -->
2012
<default>
21-
<!-- See also the files in users.d directory where the password can be overridden.
22-
Password could be specified in plaintext or in SHA256 (in hex format).
23-
If you want to specify password in plaintext (not recommended), place it in 'password' element.
24-
Example: <password>qwerty</password>.
25-
Password could be empty.
26-
If you want to specify SHA256, place it in 'password_sha256_hex' element.
27-
Example: <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>
28-
Restrictions of SHA256: impossibility to connect to ClickHouse using MySQL JS client (as of July 2019).
29-
If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
30-
Example: <password_double_sha1_hex>e395796d6546b1b65db9d665cd43f0e858dd4303</password_double_sha1_hex>
31-
If you want to specify a previously defined LDAP server (see 'ldap_servers' in the main config) for authentication,
32-
place its name in 'server' element inside 'ldap' element.
33-
Example: <ldap><server>my_ldap_server</server></ldap>
34-
If you want to authenticate the user via Kerberos (assuming Kerberos is enabled, see 'kerberos' in the main config),
35-
place 'kerberos' element instead of 'password' (and similar) elements.
36-
The name part of the canonical principal name of the initiator must match the user name for authentication to succeed.
37-
You can also place 'realm' element inside 'kerberos' element to further restrict authentication to only those requests
38-
whose initiator's realm matches it.
39-
Example: <kerberos />
40-
Example: <kerberos><realm>EXAMPLE.COM</realm></kerberos>
41-
How to generate decent password:
42-
Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
43-
In first line will be password and in second - corresponding SHA256.
44-
How to generate double SHA1:
45-
Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha1sum | tr -d '-' | xxd -r -p | sha1sum | tr -d '-'
46-
In first line will be password and in second - corresponding double SHA1.
47-
-->
4813
<password></password>
49-
50-
<!-- List of networks with open access.
51-
To open access from everywhere, specify:
52-
<ip>::/0</ip>
53-
To open access only from localhost, specify:
54-
<ip>::1</ip>
55-
<ip>127.0.0.1</ip>
56-
Each element of list has one of the following forms:
57-
<ip> IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
58-
2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
59-
<host> Hostname. Example: server01.clickhouse.com.
60-
To check access, DNS query is performed, and all received addresses compared to peer address.
61-
<host_regexp> Regular expression for host names. Example, ^server\d\d-\d\d-\d\.clickhouse\.com$
62-
To check access, DNS PTR query is performed for peer address and then regexp is applied.
63-
Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
64-
Strongly recommended that regexp is ends with $
65-
All results of DNS requests are cached till server restart.
66-
-->
6714
<networks>
6815
<ip>::/0</ip>
6916
</networks>
70-
71-
<!-- Settings profile for user. -->
7217
<profile>default</profile>
73-
74-
<!-- Quota for user. -->
7518
<quota>default</quota>
76-
77-
<!-- User can create other users and grant rights to them. -->
7819
<access_management>1</access_management>
79-
80-
<!-- User can manipulate named collections. -->
8120
<named_collection_control>1</named_collection_control>
82-
83-
<!-- User permissions can be granted here -->
84-
<!--
85-
<grants>
86-
<query>GRANT ALL ON *.*</query>
87-
</grants>
88-
-->
8921
</default>
9022
</users>
9123

92-
<!-- Quotas. -->
9324
<quotas>
94-
<!-- Name of quota. -->
9525
<default>
96-
<!-- Limits for time interval. You could specify many intervals with different limits. -->
9726
<interval>
98-
<!-- Length of interval. -->
9927
<duration>3600</duration>
100-
101-
<!-- No limits. Just calculate resource usage for time interval. -->
10228
<queries>0</queries>
10329
<errors>0</errors>
10430
<result_rows>0</result_rows>

devservices/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ x-programs:
5050

5151
services:
5252
clickhouse:
53-
image: ghcr.io/getsentry/image-mirror-altinity-clickhouse-server:23.8.11.29.altinitystable
53+
image: ghcr.io/getsentry/image-mirror-altinity-clickhouse-server:25.3.6.10034.altinitystable
5454
ulimits:
5555
nofile:
5656
soft: 262144
@@ -68,6 +68,7 @@ services:
6868
- clickhouse-data:/var/lib/clickhouse
6969
- ./clickhouse/config.xml:/etc/clickhouse-server/config.d/sentry.xml
7070
- ./clickhouse/users.xml:/etc/clickhouse-server/users.xml
71+
- ./clickhouse/default-password.xml:/etc/clickhouse-server/users.d/default-password.xml
7172
extra_hosts:
7273
host.docker.internal: host-gateway
7374
networks:

docker-compose.gcb.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ services:
8282
- ./config/clickhouse/macros.xml:/etc/clickhouse-server/config.d/macros.xml
8383
- ./config/clickhouse/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml
8484
- ./config/clickhouse/remote_servers.xml:/etc/clickhouse-server/config.d/remote_servers.xml
85+
- ./config/clickhouse/default-password.xml:/etc/clickhouse-server/users.d/default-password.xml
8586
ulimits:
8687
nofile:
8788
soft: 262144
@@ -99,6 +100,7 @@ services:
99100
volumes:
100101
- ./test_distributed_migrations/config/clickhouse/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml
101102
- ./test_distributed_migrations/config/clickhouse/remote_servers.xml:/etc/clickhouse-server/config.d/remote_servers.xml
103+
- ./config/clickhouse/default-password.xml:/etc/clickhouse-server/users.d/default-password.xml
102104
ulimits:
103105
nofile:
104106
soft: 262144
@@ -115,6 +117,7 @@ services:
115117
- ./test_distributed_migrations/config/clickhouse/macros-01.xml:/etc/clickhouse-server/config.d/macros.xml
116118
- ./test_distributed_migrations/config/clickhouse/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml
117119
- ./test_distributed_migrations/config/clickhouse/remote_servers.xml:/etc/clickhouse-server/config.d/remote_servers.xml
120+
- ./config/clickhouse/default-password.xml:/etc/clickhouse-server/users.d/default-password.xml
118121
ulimits:
119122
nofile:
120123
soft: 262144
@@ -131,6 +134,7 @@ services:
131134
- ./test_distributed_migrations/config/clickhouse/macros-02.xml:/etc/clickhouse-server/config.d/macros.xml
132135
- ./test_distributed_migrations/config/clickhouse/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml
133136
- ./test_distributed_migrations/config/clickhouse/remote_servers.xml:/etc/clickhouse-server/config.d/remote_servers.xml
137+
- ./config/clickhouse/default-password.xml:/etc/clickhouse-server/users.d/default-password.xml
134138
ulimits:
135139
nofile:
136140
soft: 262144
@@ -147,6 +151,7 @@ services:
147151
- ./test_distributed_migrations/config/clickhouse/macros-03.xml:/etc/clickhouse-server/config.d/macros.xml
148152
- ./test_distributed_migrations/config/clickhouse/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml
149153
- ./test_distributed_migrations/config/clickhouse/remote_servers.xml:/etc/clickhouse-server/config.d/remote_servers.xml
154+
- ./config/clickhouse/default-password.xml:/etc/clickhouse-server/users.d/default-password.xml
150155
ulimits:
151156
nofile:
152157
soft: 262144
@@ -163,6 +168,7 @@ services:
163168
- ./test_distributed_migrations/config/clickhouse/macros-04.xml:/etc/clickhouse-server/config.d/macros.xml
164169
- ./test_distributed_migrations/config/clickhouse/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml
165170
- ./test_distributed_migrations/config/clickhouse/remote_servers.xml:/etc/clickhouse-server/config.d/remote_servers.xml
171+
- ./config/clickhouse/default-password.xml:/etc/clickhouse-server/users.d/default-password.xml
166172
ulimits:
167173
nofile:
168174
soft: 262144

0 commit comments

Comments
 (0)