Skip to content

fix(worker): replace time.Sleep with channel sync in consumer manager test #7971

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
arzonus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(worker): replace time.Sleep with channel sync in consumer manager test #7971

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
8 changes: 8 additions & 0 deletions service/worker/asyncworkflow/async_workflow_consumer_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ func WithEmitConsumerCountMetrifFn(fn func(int)) ConsumerManagerOptions {
}
}

func withAfterIterFn(fn func()) ConsumerManagerOptions {
return func(c *ConsumerManager) { c.afterIterFn = fn }
}

func NewConsumerManager(
logger log.Logger,
metricsClient metrics.Client,
Expand Down Expand Up @@ -119,6 +123,7 @@ type ConsumerManager struct {
wg sync.WaitGroup
activeConsumers map[string]provider.Consumer
emitConsumerCountMetricFn func(int)
afterIterFn func() // test hook: called after each ticker iteration, nil in production
}

func (c *ConsumerManager) Start() {
Expand Down Expand Up @@ -176,6 +181,9 @@ func (c *ConsumerManager) run() {
c.logger.Info("ConsumerManager background loop stopped because context is done")
return
}
if c.afterIterFn != nil {
c.afterIterFn()
}
}
}

Expand Down
15 changes: 12 additions & 3 deletions service/worker/asyncworkflow/async_workflow_consumer_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,8 @@ func TestConsumerManagerEnabledDisabled(t *testing.T) {

var consumerMgrEnabled, consumerCount int32

refreshed := make(chan struct{}, 1)

// create consumer manager
cm := NewConsumerManager(
testlogger.New(t),
Expand All @@ -363,15 +365,22 @@ func TestConsumerManagerEnabledDisabled(t *testing.T) {
WithEmitConsumerCountMetrifFn(func(count int) {
atomic.StoreInt32(&consumerCount, int32(count))
}),
withAfterIterFn(func() {
select {
case refreshed <- struct{}{}:
default:
}
}),
)

cm.Start()
defer cm.Stop()

// wait for the first round of consumers to be created and verify consumer count
atomic.StoreInt32(&consumerMgrEnabled, 1)
mockTimeSrc.BlockUntil(1) // wait for run() goroutine to create the ticker
mockTimeSrc.Advance(defaultRefreshInterval)
time.Sleep(50 * time.Millisecond)
<-refreshed
t.Log("first round comparison")
got := atomic.LoadInt32(&consumerCount)
want := 1 // consumer manager is enabled
Expand All @@ -382,7 +391,7 @@ func TestConsumerManagerEnabledDisabled(t *testing.T) {
// disable consumer manager and wait for the second round of refresh
atomic.StoreInt32(&consumerMgrEnabled, 0)
mockTimeSrc.Advance(defaultRefreshInterval)
time.Sleep(50 * time.Millisecond)
<-refreshed
got = atomic.LoadInt32(&consumerCount)
want = 0 // all consumers should be stopped when consumer manager is disabled
if got != int32(want) {
Expand All @@ -392,7 +401,7 @@ func TestConsumerManagerEnabledDisabled(t *testing.T) {
// enable consumer manager and wait for the third round of refresh
atomic.StoreInt32(&consumerMgrEnabled, 1)
mockTimeSrc.Advance(defaultRefreshInterval)
time.Sleep(50 * time.Millisecond)
<-refreshed
got = atomic.LoadInt32(&consumerCount)
want = 1 // consumer manager is enabled
if got != int32(want) {
Expand Down
Loading