Skip to content

Fix check for encrypted disks over plain_rewritable#95470

Merged
azat merged 3 commits intoClickHouse:masterfrom
azat:encrypted-plain-rewriteable-check-fix
Jan 29, 2026
Merged

Fix check for encrypted disks over plain_rewritable#95470
azat merged 3 commits intoClickHouse:masterfrom
azat:encrypted-plain-rewriteable-check-fix

Conversation

@azat
Copy link
Member

@azat azat commented Jan 28, 2026 •
edited
Loading

Changelog category (leave one):

  • Bug Fix (user-visible misbehavior in an official stable release)

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

Fix check for encrypted disks over plain_rewritable (Fixes possible It is not possible to register multiple plain-rewritable disks with the same object storage prefix)

Previously if you have two encrypted disks points to the same plain_rewritable, i.e. one over cache and one not, you will get "It is not possible to register multiple plain-rewritable disks with the same object storage prefix".

Fixes: #94852 (cc @yariks5s )

@azat azat requested a review from Michicosun January 28, 2026 20:06
@azat azat added the pr-must-backport Pull request should be backported intentionally. Use this label with great care! label Jan 28, 2026
@clickhouse-gh
Copy link
Contributor

clickhouse-gh bot commented Jan 28, 2026 •
edited
Loading

Workflow [PR], commit [ea032b1]

Summary: ❌

job_name test_name status info comment
Stress test (amd_debug) failure
Logical error: Block structure mismatch in A stream: different number of columns: (STID: 0993-38e6) FAIL cidb, issue
Stress test (amd_tsan) failure
Logical error: Block structure mismatch in A stream: different number of columns: (STID: 0993-2da1) FAIL cidb, issue
Stress test (arm_asan) failure
Logical error: Block structure mismatch in A stream: different number of columns: (STID: 0993-38e6) FAIL cidb, issue
Stress test (arm_asan, s3) failure
Logical error: Block structure mismatch in A stream: different number of columns: (STID: 0993-38e6) FAIL cidb, issue
Stress test (amd_ubsan) failure
Logical error: Block structure mismatch in A stream: different number of columns: (STID: 0993-38e6) FAIL cidb, issue

@clickhouse-gh clickhouse-gh bot added the pr-bugfix Pull request with bugfix, not backported by default label Jan 28, 2026
@Michicosun Michicosun self-assigned this Jan 28, 2026
Michicosun
Michicosun reviewed Jan 28, 2026
View reviewed changes
@azat azat enabled auto-merge January 29, 2026 07:07
@azat
Fix check for encrypted disks over plain_rewritable
cf85a1c 
Previously if you have two encrypted disks points to the same
plain_rewritable, i.e. one over cache and one not, you will get "It is
not possible to register multiple plain-rewritable disks with the same
object storage prefix".

Fixes: ClickHouse#94852
@azat azat force-pushed the encrypted-plain-rewriteable-check-fix branch from 7dbd005 to cf85a1c Compare January 29, 2026 07:46
@azat azat added this pull request to the merge queue Jan 29, 2026
Merged via the queue into ClickHouse:master with commit 0bfa024 Jan 29, 2026
128 of 134 checks passed
@azat azat deleted the encrypted-plain-rewriteable-check-fix branch January 29, 2026 15:39
@robot-clickhouse robot-clickhouse added the pr-synced-to-cloud The PR is synced to the cloud repo label Jan 29, 2026
@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-must-backport-synced The `*-must-backport` labels are synced into the cloud Sync PR label Jan 29, 2026
This was referenced Jan 29, 2026
Closed
Merged
Merged
robot-clickhouse-ci-2 added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse-ci-2
Merge pull request #95543 from ClickHouse/cherrypick/25.10/95470
a049899 
Cherry pick #95470 to 25.10: Fix check for encrypted disks over plain_rewritable
robot-clickhouse added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse
Backport #95470 to 25.10: Fix check for encrypted disks over plain_re…
f500f89 
…writable
This was referenced Jan 29, 2026
Merged
Merged
robot-clickhouse-ci-2 added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse-ci-2
Merge pull request #95545 from ClickHouse/cherrypick/25.11/95470
ecd2ee0 
Cherry pick #95470 to 25.11: Fix check for encrypted disks over plain_rewritable
robot-clickhouse added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse
Backport #95470 to 25.11: Fix check for encrypted disks over plain_re…
d2196c6 
…writable
This was referenced Jan 29, 2026
Merged
Merged
robot-clickhouse-ci-2 added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse-ci-2
Merge pull request #95548 from ClickHouse/cherrypick/25.12/95470
b262e14 
Cherry pick #95470 to 25.12: Fix check for encrypted disks over plain_rewritable
robot-clickhouse added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse
Backport #95470 to 25.12: Fix check for encrypted disks over plain_re…
90ad8a7 
…writable
This was referenced Jan 29, 2026
Merged
Merged
robot-clickhouse-ci-2 added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse-ci-2
Merge pull request #95550 from ClickHouse/cherrypick/26.1/95470
75f7bf8 
Cherry pick #95470 to 26.1: Fix check for encrypted disks over plain_rewritable
robot-clickhouse added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse
Backport #95470 to 26.1: Fix check for encrypted disks over plain_rew…
83afd2e 
…ritable
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 mentioned this pull request Jan 29, 2026
Merged
robot-ch-test-poll4 added a commit that referenced this pull request Jan 29, 2026
@robot-ch-test-poll4
Merge pull request #95542 from ClickHouse/cherrypick/25.8/95470
289ea35 
Cherry pick #95470 to 25.8: Fix check for encrypted disks over plain_rewritable
robot-clickhouse added a commit that referenced this pull request Jan 29, 2026
@robot-clickhouse
Backport #95470 to 25.8: Fix check for encrypted disks over plain_rew…
d2c83d2 
…ritable
@robot-ch-test-poll4 robot-ch-test-poll4 mentioned this pull request Jan 29, 2026
Merged
clickhouse-gh bot added a commit that referenced this pull request Jan 29, 2026
@clickhouse-gh
Merge pull request #95551 from ClickHouse/backport/26.1/95470
50bf811 
Backport #95470 to 26.1: Fix check for encrypted disks over plain_rewritable
@robot-ch-test-poll2 robot-ch-test-poll2 added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Jan 29, 2026
clickhouse-gh bot added a commit that referenced this pull request Jan 29, 2026
@clickhouse-gh
Merge pull request #95546 from ClickHouse/backport/25.11/95470
b6992df 
Backport #95470 to 25.11: Fix check for encrypted disks over plain_rewritable
clickhouse-gh bot added a commit that referenced this pull request Jan 29, 2026
@clickhouse-gh
Merge pull request #95559 from ClickHouse/backport/25.8/95470
40701eb 
Backport #95470 to 25.8: Fix check for encrypted disks over plain_rewritable
azat added a commit that referenced this pull request Jan 29, 2026
@azat
Merge pull request #95549 from ClickHouse/backport/25.12/95470
745d5a0 
Backport #95470 to 25.12: Fix check for encrypted disks over plain_rewritable
azat added a commit that referenced this pull request Jan 29, 2026
@azat
Merge pull request #95544 from ClickHouse/backport/25.10/95470
0734b00 
Backport #95470 to 25.10: Fix check for encrypted disks over plain_rewritable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Michicosun Michicosun Michicosun approved these changes

Assignees

@Michicosun Michicosun

Labels

pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-bugfix Pull request with bugfix, not backported by default pr-must-backport Pull request should be backported intentionally. Use this label with great care! pr-must-backport-synced The `*-must-backport` labels are synced into the cloud Sync PR pr-synced-to-cloud The PR is synced to the cloud repo

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@azat @Michicosun @robot-clickhouse @robot-ch-test-poll1 @robot-ch-test-poll2