JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/repair: Fix flaky test

Browse Source 
Don't use global monkit.Default in Queue Stat test, or it can fail due
to concurrently-executing tests.

Change-Id: I061d626f26220705c8dd0de17ac7e14c81831d7f
This commit is contained in:
Moby von Briesen 2023-12-05 16:17:49 -05:00
parent 5094100e21
commit c87f380e2e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
satellite/core.go
View File

@ -594,7 +594,7 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB,
{ {
if config.RepairQueueCheck.Interval.Seconds() > 0 { if config.RepairQueueCheck.Interval.Seconds() > 0 {
peer.RepairQueueStat.Chore = repairer.NewQueueStat(log, placement.SupportedPlacements(), db.RepairQueue(), config.RepairQueueCheck.Interval) peer.RepairQueueStat.Chore = repairer.NewQueueStat(log, monkit.Default, placement.SupportedPlacements(), db.RepairQueue(), config.RepairQueueCheck.Interval)
peer.Services.Add(lifecycle.Item{ peer.Services.Add(lifecycle.Item{
Name: "queue-stat", Name: "queue-stat",

8
satellite/repair/repairer/queue_stat.go
View File

@ -27,6 +27,7 @@ type QueueStatConfig struct {
type QueueStat struct { type QueueStat struct {
db queue.RepairQueue db queue.RepairQueue
log *zap.Logger log *zap.Logger
mon *monkit.Scope
Loop *sync2.Cycle Loop *sync2.Cycle
mu sync.Mutex mu sync.Mutex
stats map[string]queue.Stat stats map[string]queue.Stat
@ -37,21 +38,22 @@ type QueueStat struct {
var _ monkit.StatSource = &QueueStat{} var _ monkit.StatSource = &QueueStat{}
// NewQueueStat creates a chore to stat repair queue statistics. // NewQueueStat creates a chore to stat repair queue statistics.
func NewQueueStat(log *zap.Logger, placements []storj.PlacementConstraint, db queue.RepairQueue, checkInterval time.Duration) *QueueStat { func NewQueueStat(log *zap.Logger, registry *monkit.Registry, placements []storj.PlacementConstraint, db queue.RepairQueue, checkInterval time.Duration) *QueueStat {
chore := &QueueStat{ chore := &QueueStat{
db: db, db: db,
log: log, log: log,
mon: registry.Package(),
Loop: sync2.NewCycle(checkInterval), Loop: sync2.NewCycle(checkInterval),
placements: placements, placements: placements,
} }
mon.Chain(chore) chore.mon.Chain(chore)
return chore return chore
} }
// Run logs the current version information. // Run logs the current version information.
func (c *QueueStat) Run(ctx context.Context) (err error) { func (c *QueueStat) Run(ctx context.Context) (err error) {
defer mon.Task()(&ctx)(&err) defer c.mon.Task()(&ctx)(&err)
return c.Loop.Run(ctx, func(ctx context.Context) error { return c.Loop.Run(ctx, func(ctx context.Context) error {
c.RunOnce(ctx) c.RunOnce(ctx)
return nil return nil

5
satellite/repair/repairer/queue_stat_test.go
View File

@ -41,11 +41,12 @@ func TestStatChore(t *testing.T) {
}) })
require.NoError(t, err) require.NoError(t, err)
chore := repairer.NewQueueStat(zaptest.NewLogger(t), []storj.PlacementConstraint{0, 1, 2}, db.RepairQueue(), 100*time.Hour) registry := monkit.NewRegistry()
chore := repairer.NewQueueStat(zaptest.NewLogger(t), registry, []storj.PlacementConstraint{0, 1, 2}, db.RepairQueue(), 100*time.Hour)
collectMonkitStat := func() map[string]float64 { collectMonkitStat := func() map[string]float64 {
monkitValues := map[string]float64{} monkitValues := map[string]float64{}
monkit.Default.Stats(func(key monkit.SeriesKey, field string, val float64) { registry.Stats(func(key monkit.SeriesKey, field string, val float64) {
if key.Measurement != "repair_queue" { if key.Measurement != "repair_queue" {
return return
} }