Skip to content

fix(compactor): de-flake sharded-ownership compactor tests (reduce mock workload, align poll budget) #7617

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

Open
sandy2008 wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

fix(compactor): de-flake sharded-ownership compactor tests (reduce mock workload, align poll budget) #7617

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions pkg/compactor/compactor_paritioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ func TestPartitionCompactor_ShouldCompactAllUsersOnShardingEnabledButOnlyOneInst

func TestPartitionCompactor_ShouldCompactOnlyUsersOwnedByTheInstanceOnShardingEnabledAndMultipleInstancesRunning(t *testing.T) {

numUsers := 100
numUsers := 20

// Setup user IDs
userIDs := make([]string, 0, numUsers)
Expand Down Expand Up @@ -1192,6 +1192,7 @@ func TestPartitionCompactor_ShouldCompactOnlyUsersOwnedByTheInstanceOnShardingEn
cfg.ShardingRing.InstanceAddr = fmt.Sprintf("127.0.0.%d", i)
cfg.ShardingRing.WaitStabilityMinDuration = time.Second
cfg.ShardingRing.WaitStabilityMaxDuration = 5 * time.Second
cfg.ShardingRing.WaitActiveInstanceTimeout = 30 * time.Second // Give the ring ACTIVE wait headroom on slow CI (#7503).
cfg.ShardingRing.KVStore.Mock = kvstore

c, _, tsdbPlanner, l, _ := prepareForPartitioning(t, cfg, bucketClient, nil, nil)
Expand All @@ -1214,7 +1215,7 @@ func TestPartitionCompactor_ShouldCompactOnlyUsersOwnedByTheInstanceOnShardingEn

// Wait until a run has been completed on each compactor
for _, c := range compactors {
cortex_testutil.Poll(t, 60*time.Second, true, func() any {
cortex_testutil.Poll(t, 120*time.Second, true, func() any {
return prom_testutil.ToFloat64(c.CompactionRunsCompleted) >= 1
})
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/compactor/compactor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,7 +1091,7 @@ func TestCompactor_ShouldCompactAllUsersOnShardingEnabledButOnlyOneInstanceRunni
func TestCompactor_ShouldCompactOnlyUsersOwnedByTheInstanceOnShardingEnabledAndMultipleInstancesRunning(t *testing.T) {
t.Parallel()

numUsers := 100
numUsers := 20

// Setup user IDs
userIDs := make([]string, 0, numUsers)
Expand Down Expand Up @@ -1139,6 +1139,7 @@ func TestCompactor_ShouldCompactOnlyUsersOwnedByTheInstanceOnShardingEnabledAndM
cfg.ShardingRing.InstanceAddr = fmt.Sprintf("127.0.0.%d", i)
cfg.ShardingRing.WaitStabilityMinDuration = time.Second
cfg.ShardingRing.WaitStabilityMaxDuration = 5 * time.Second
cfg.ShardingRing.WaitActiveInstanceTimeout = 30 * time.Second // Give the ring ACTIVE wait headroom on slow CI (#7503).
cfg.ShardingRing.KVStore.Mock = kvstore

c, _, tsdbPlanner, l, _ := prepare(t, cfg, bucketClient, nil)
Expand Down
Loading