Skip to content

Fix race between distributed DDL and dropping Replicated database#95664

Merged
tavplubix merged 2 commits intomasterfrom
fix_dddl_drop_rdb_race
Jan 31, 2026
Merged

Fix race between distributed DDL and dropping Replicated database#95664
tavplubix merged 2 commits intomasterfrom
fix_dddl_drop_rdb_race

Conversation

@tavplubix
Copy link
Member

@tavplubix tavplubix commented Jan 30, 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):

Fixed There was an error: Cannot obtain error message logical error when waiting for a distributed DDL and dropping the Replicated database concurrently. Fixes #95539

Documentation entry for user-facing changes

  • Documentation is written (mandatory for new features)

@clickhouse-gh
Copy link
Contributor

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

Workflow [PR], commit [ae3b581]

Summary: ❌

job_name test_name status info comment
Stateless tests (amd_binary, old analyzer, s3 storage, DatabaseReplicated, parallel) failure
03820_plain_rewritable_over_another_disk_with_same_path FAIL cidb
02151_hash_table_sizes_stats_joins FAIL cidb
03546_part_granule_offset FAIL cidb
00124_shard_distributed_with_many_replicas FAIL cidb
01114_materialize_clear_index_compact_parts FAIL cidb
03753_tuple_inside_nullable_experimental_setting FAIL cidb
03786_empty_tuple_map_array FAIL cidb
01835_alias_to_primary_key_cyfdecyf FAIL cidb
01319_mv_constants_bug FAIL cidb
02346_text_index_experimental_flag FAIL cidb
105 more test cases not shown
Upgrade check (amd_tsan) failure
Error message in clickhouse-server.log (see upgrade_error_messages.txt) FAIL cidb
Upgrade check (amd_msan) failure
Error message in clickhouse-server.log (see upgrade_error_messages.txt) FAIL cidb
Finish Workflow failure
python3 ./ci/jobs/scripts/workflow_hooks/new_tests_check.py failure

@clickhouse-gh clickhouse-gh bot added the pr-bugfix Pull request with bugfix, not backported by default label Jan 30, 2026
@tavplubix tavplubix force-pushed the fix_dddl_drop_rdb_race branch from d542045 to ff0497e Compare January 30, 2026 16:17
@serxa serxa self-assigned this Jan 30, 2026
serxa
serxa approved these changes Jan 30, 2026
View reviewed changes
src/Interpreters/ReplicatedDatabaseQueryStatusSource.h

private:
static Block getSampleBlock();
DDLGuardPtr database_guard;
Copy link
Member

@serxa serxa Jan 30, 2026

Choose a reason for hiding this comment

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

Maybe add a small comment here about why should we hold this lock? It seems not so obvious.

tavplubix
tavplubix commented Jan 30, 2026
View reviewed changes
@tavplubix tavplubix added the pr-must-backport Pull request should be backported intentionally. Use this label with great care! label Jan 30, 2026
@tavplubix tavplubix enabled auto-merge January 31, 2026 20:19
@tavplubix tavplubix added this pull request to the merge queue Jan 31, 2026
Merged via the queue into master with commit 3e924f1 Jan 31, 2026
129 of 134 checks passed
@tavplubix tavplubix deleted the fix_dddl_drop_rdb_race branch January 31, 2026 20:37
@robot-ch-test-poll4 robot-ch-test-poll4 added the pr-synced-to-cloud The PR is synced to the cloud repo label Jan 31, 2026
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 added the pr-must-backport-synced The `*-must-backport` labels are synced into the cloud Sync PR label Jan 31, 2026
This was referenced Jan 31, 2026
Closed
Merged
robot-ch-test-poll1 added a commit that referenced this pull request Jan 31, 2026
@robot-ch-test-poll1
Merge pull request #95690 from ClickHouse/cherrypick/25.8/95664
fb07c16 
Cherry pick #95664 to 25.8: Fix race between distributed DDL and dropping Replicated database
robot-clickhouse added a commit that referenced this pull request Jan 31, 2026
@robot-clickhouse
Backport #95664 to 25.8: Fix race between distributed DDL and droppin…
cb90c71 
…g Replicated database
This was referenced Jan 31, 2026
Merged
Merged
robot-ch-test-poll1 added a commit that referenced this pull request Jan 31, 2026
@robot-ch-test-poll1
Merge pull request #95692 from ClickHouse/cherrypick/25.10/95664
2fc92e4 
Cherry pick #95664 to 25.10: Fix race between distributed DDL and dropping Replicated database
robot-clickhouse added a commit that referenced this pull request Jan 31, 2026
@robot-clickhouse
Backport #95664 to 25.10: Fix race between distributed DDL and droppi…
f70f2f4 
…ng Replicated database
This was referenced Jan 31, 2026
Merged
Merged
robot-ch-test-poll1 added a commit that referenced this pull request Jan 31, 2026
@robot-ch-test-poll1
Merge pull request #95694 from ClickHouse/cherrypick/25.11/95664
a002147 
Cherry pick #95664 to 25.11: Fix race between distributed DDL and dropping Replicated database
robot-clickhouse added a commit that referenced this pull request Jan 31, 2026
@robot-clickhouse
Backport #95664 to 25.11: Fix race between distributed DDL and droppi…
b6ad296 
…ng Replicated database
This was referenced Jan 31, 2026
Merged
Merged
robot-ch-test-poll1 added a commit that referenced this pull request Jan 31, 2026
@robot-ch-test-poll1
Merge pull request #95696 from ClickHouse/cherrypick/25.12/95664
b94c113 
Cherry pick #95664 to 25.12: Fix race between distributed DDL and dropping Replicated database
robot-clickhouse added a commit that referenced this pull request Jan 31, 2026
@robot-clickhouse
Backport #95664 to 25.12: Fix race between distributed DDL and droppi…
3a8ed22 
…ng Replicated database
This was referenced Jan 31, 2026
Merged
Merged
robot-ch-test-poll1 added a commit that referenced this pull request Jan 31, 2026
@robot-ch-test-poll1
Merge pull request #95698 from ClickHouse/cherrypick/26.1/95664
82c222d 
Cherry pick #95664 to 26.1: Fix race between distributed DDL and dropping Replicated database
robot-clickhouse added a commit that referenced this pull request Jan 31, 2026
@robot-clickhouse
Backport #95664 to 26.1: Fix race between distributed DDL and droppin…
bc0c485 
…g Replicated database
@robot-ch-test-poll1 robot-ch-test-poll1 mentioned this pull request Jan 31, 2026
Merged
clickhouse-gh bot added a commit that referenced this pull request Jan 31, 2026
@clickhouse-gh
Merge pull request #95697 from ClickHouse/backport/25.12/95664
a0629b3 
Backport #95664 to 25.12: Fix race between distributed DDL and dropping Replicated database
@robot-ch-test-poll robot-ch-test-poll mentioned this pull request Jan 31, 2026
Closed
clickhouse-gh bot added a commit that referenced this pull request Jan 31, 2026
@clickhouse-gh
Merge pull request #95699 from ClickHouse/backport/26.1/95664
5377939 
Backport #95664 to 26.1: Fix race between distributed DDL and dropping Replicated database
clickhouse-gh bot added a commit that referenced this pull request Jan 31, 2026
@clickhouse-gh
Merge pull request #95693 from ClickHouse/backport/25.10/95664
853dbd2 
Backport #95664 to 25.10: Fix race between distributed DDL and dropping Replicated database
clickhouse-gh bot added a commit that referenced this pull request Jan 31, 2026
@clickhouse-gh
Merge pull request #95695 from ClickHouse/backport/25.11/95664
07c7d64 
Backport #95664 to 25.11: Fix race between distributed DDL and dropping Replicated database
clickhouse-gh bot added a commit that referenced this pull request Feb 1, 2026
@clickhouse-gh
Merge pull request #95691 from ClickHouse/backport/25.8/95664
7938087 
Backport #95664 to 25.8: Fix race between distributed DDL and dropping Replicated database
@RinChanNOWWW RinChanNOWWW mentioned this pull request Feb 2, 2026
Merged
1 task
@alexey-milovidov alexey-milovidov mentioned this pull request Feb 7, 2026
Closed
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Feb 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serxa serxa serxa approved these changes

Assignees

@serxa serxa

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.

Logical error: There was an error on A: B (probably it's a bug) (STID: 6337-3cad)

4 participants

@tavplubix @serxa @robot-ch-test-poll4 @robot-clickhouse-ci-1