Skip to content

ccl/multiregionccl: deflake multi-region datadriven test#109819

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
kvoli:230831.multi-region-datadriven-disable-transfers
Sep 1, 2023
Merged

ccl/multiregionccl: deflake multi-region datadriven test#109819
craig[bot] merged 2 commits intocockroachdb:masterfrom
kvoli:230831.multi-region-datadriven-disable-transfers

Conversation

@kvoli
Copy link
Copy Markdown
Contributor

@kvoli kvoli commented Aug 31, 2023

Previously, TestMultiRegionDataDriven allowed kvserver (replicate queue) lease transfers to occur for lease count rebalancing. Load based rebalancing was disabled in an earlier patch #109050, however we saw in interleaving replication changes -- leading to flaky behavior.

Bump the kv.allocator.min_lease_transfer_interval to 5 minutes, effectively disabling internal lease transfers. Lease transfers which are required for lease preference satisfaction, and manual transfers are still permitted.

Fixes: #109215
Release note: None


TestMultiRegionDataDriven speeds up replication changes by proactively
enqueuing replicas into various queues. This has the benefit of reducing
the time taken after zone config changes, however the downside of added
overhead.

Disable the test under deadlock builds, as the test is slow and
susceptible to (legitimate) timing issues on a deadlock build.

Informs: #109215
Release note: None

Previously, `TestMultiRegionDataDriven` allowed kvserver (replicate
queue) lease transfers to occur for lease count rebalancing. Load based
rebalancing was disabled in an earlier patch cockroachdb#109050, however we saw in
interleaving replication changes -- leading to flaky behavior.

Bump the `kv.allocator.min_lease_transfer_interval` to 5 minutes,
effectively disabling internal lease transfers. Lease transfers which
are required for lease preference satisfaction, and manual transfers are
still permitted.

Fixes: cockroachdb#109215
Release note: None
@kvoli kvoli added backport-22.2.x backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only labels Aug 31, 2023
@kvoli kvoli self-assigned this Aug 31, 2023
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@kvoli kvoli changed the title ccl/multiregionccl: disable transfers in multiregion test ccl/multiregionccl: deflake multi-region datadriven test Aug 31, 2023
@kvoli kvoli marked this pull request as ready for review August 31, 2023 17:58
@kvoli kvoli requested a review from a team as a code owner August 31, 2023 17:58
@kvoli kvoli requested a review from rafiss August 31, 2023 17:59
Copy link
Copy Markdown
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

nice improvements, ty

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @kvoli)


pkg/ccl/multiregionccl/datadriven_test.go line 117 at r2 (raw file):

	skip.UnderRace(t, "flaky test")
	skip.UnderDeadlock(t, "flaky test")

super nit: the commit message has a nice explanation. that (or a summary) could be included here in the code so that a future reader can more easily understand why it's legitimate to skip under deadlock

`TestMultiRegionDataDriven` speeds up replication changes by proactively
enqueuing replicas into various queues. This has the benefit of reducing
the time taken after zone config changes, however the downside of added
overhead.

Disable the test under deadlock builds, as the test is slow and
susceptible to (legitimate) timing issues on a deadlock build.

Informs: cockroachdb#109215
Release note: None
@kvoli kvoli force-pushed the 230831.multi-region-datadriven-disable-transfers branch from c156fb7 to 374ab7b Compare September 1, 2023 15:36
Copy link
Copy Markdown
Contributor Author

@kvoli kvoli left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @rafiss)


pkg/ccl/multiregionccl/datadriven_test.go line 117 at r2 (raw file):

Previously, rafiss (Rafi Shamim) wrote…

super nit: the commit message has a nice explanation. that (or a summary) could be included here in the code so that a future reader can more easily understand why it's legitimate to skip under deadlock

Good idea, I've added a slightly modified commit message summary here.

@kvoli
Copy link
Copy Markdown
Contributor Author

kvoli commented Sep 1, 2023

TYFTR

bors r=rafiss

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Sep 1, 2023

Build succeeded:

@craig craig bot merged commit bdf2b4e into cockroachdb:master Sep 1, 2023
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Sep 1, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 374ab7b to blathers/backport-release-22.2-109819: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


error creating merge commit from 374ab7b to blathers/backport-release-23.1-109819: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


error creating merge commit from 374ab7b to blathers/backport-release-23.1.9-rc-109819: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.9-rc failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ccl/multiregionccl: TestMultiRegionDataDriven failed

3 participants