Corrections after reworking backup/restore synchronization #2#71912
Merged
vitlibar merged 1 commit intoClickHouse:masterfrom Nov 14, 2024
Merged
Conversation
Contributor
|
This is an automated comment for commit 380aea0 with description of existing statuses. It's updated for the latest CI running ❌ Click here to open a full report in a separate page
Successful checks
|
Member
Author
|
Some tests are still failing (see), so this PR will help them. |
vitlibar
commented
Nov 14, 2024
Comment on lines
+502
to
+503
| if (should_stop()) | ||
| return; |
Member
Author
There was a problem hiding this comment.
This is to help a cancelled backup to stop working faster, that must help test_backup_restore_on_cluster/test_cancel_backup.py::test_cancel_backup.
vitlibar
commented
Nov 14, 2024
| { | ||
| concurrency_check.emplace(is_restore, /* on_cluster = */ true, zookeeper_path, allow_concurrency, concurrency_counters_); | ||
| createStartAndAliveNodes(); | ||
| createStartAndAliveNodesAndCheckConcurrency(concurrency_counters_); |
Member
Author
There was a problem hiding this comment.
The concurrency check was improved a bit, that must help test_backup_restore_on_cluster/test_disallow_concurrency.py::test_concurrent_backups_on_different_nodes to stop being flaky.
thevar1able
approved these changes
Nov 14, 2024
Member
Author
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):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Follow-up to #70027 and #71715