Merged
Conversation
Contributor
|
Workflow [PR], commit [10a06df] Summary: ❌
|
1 task
bce4f37 to
7a241ad
Compare
c1f9d3c to
2057156
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses flakiness in the test_ttl_move integration test caused by timing issues and race conditions in the test logic. The changes focus on making the test more deterministic by fixing wait conditions, eliminating multi-state checks that could skip intermediate states under load, and removing an inherently flaky test case.
Changes:
- Fixed timing issues in move completion checks by asserting expected target state
- Eliminated multi-state test scenarios that could skip stages under pressure
- Removed
TestCancelBackgroundMovingtest case due to inherent timing issues - Refactored test parametrization and merged similar test scenarios
2057156 to
c2f17c9
Compare
kssenii
approved these changes
Feb 10, 2026
kssenii
reviewed
Feb 10, 2026
| .strip() | ||
| .split("\n") | ||
| ) | ||
| def check_if_should_skip_this_then_skip(node): |
Member
There was a problem hiding this comment.
Suggested change
| def check_if_should_skip_this_then_skip(node): | |
| def skip_test_if_needed(node): |
kssenii
reviewed
Feb 10, 2026
Co-authored-by: Kseniia Sumarokova <kssenii@clickhouse.com>
alexey-milovidov
added a commit
that referenced
this pull request
Feb 10, 2026
Cherry-pick of c2f17c9 ("Fix flaky test_ttl_move") by Arsen Muk. Replaces hardcoded sleeps with proper retry-based waiting, eliminates multi-state timing issues using `STOP`/`START MOVES`, and restructures storage policies for clarity. `TestCancelBackgroundMoving` is removed in this commit (will be re-added with failpoint approach in next commit). Co-authored-by: Arsen Muk <arsenmuk@clickhouse.com>
alexey-milovidov
added a commit
that referenced
this pull request
Feb 10, 2026
Replace the TODO comment left by PR #94853 with a failpoint-based implementation of the `test_cancel_background_moving_on_stop_moves_query` test. Instead of using disk throughput throttling (which was unreliable and caused the original flakiness), use the `stop_moving_part_before_swap_with_active` failpoint to deterministically pause the move after cloning but before swapping. This guarantees the move is still in progress when `SYSTEM STOP MOVES` cancels it. Key improvements over the original: - No server restart needed (no disk_throttling.xml config changes) - No race condition: the failpoint guarantees the move is in-flight - Table-scoped `SYSTEM STOP/START MOVES` instead of global - Uses `get_disk_names` helper from refactored test infrastructure - Removed `test_cancel_background_moving_on_table_detach` and `test_cancel_background_moving_on_zookeeper_disconnect` which had the same throttling-based flakiness issues Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changelog category (leave one):
Closes #85011
Closes #93340
Motivation:
It was flaky due to several reasons:
Modifications: