Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 23-3 #1697

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Merge 23-3 #1697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,10 @@ Y_UNIT_TEST_SUITE(TMirrorPartitionTest)
env.WriteReplica(1, range3, 'B');

iterations = 0;
while (fullCyclesCount < 3 && iterations++ < 100) {
// at this point, scrubbing may not start from the beginning,
// so we need to wait for 2 cycles to be sure that
// it has scanned the entire disk at least once
while (fullCyclesCount < 4 && iterations++ < 100) {
if (prevScrubbingProgress != 0 &&
counters.Simple.ScrubbingProgress.Value == 0)
{
Expand All @@ -1257,7 +1260,10 @@ Y_UNIT_TEST_SUITE(TMirrorPartitionTest)

// check that all ranges was resynced and there is no more mismatches
iterations = 0;
while (fullCyclesCount < 4 && iterations++ < 100) {
// at this point, scrubbing may not start from the beginning,
// so we need to wait for 2 cycles to be sure that
// it has scanned the entire disk at least once
while (fullCyclesCount < 6 && iterations++ < 100) {
if (prevScrubbingProgress != 0 &&
counters.Simple.ScrubbingProgress.Value == 0)
{
Expand Down
Loading