Skip to content

popm: don't instantly noop if bfg response channel is busy #450

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

Merged
ClaytonNorthey92 merged 3 commits into from
Mar 20, 2025
Merged

popm: don't instantly noop if bfg response channel is busy #450

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01904ac
prior, whenever the channel that would receive bfg responses in pop m…
AL-CT Mar 19, 2025
047b77f
change timeout to configured timeout
AL-CT Mar 19, 2025
ca26482
add one more case for ctx.Done()
ClaytonNorthey92 Mar 20, 2025
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 service/popm/popm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ func (m *Miner) handleBFGCallCompletion(parrentCtx context.Context, conn *protoc

log.Tracef("handleBFGCallCompletion: %v", spew.Sdump(bc.msg))

_, _, payload, err := bfgapi.Call(ctx, conn, bc.msg)
cmd, _, payload, err := bfgapi.Call(ctx, conn, bc.msg)
if err != nil {
log.Debugf("handleBFGCallCompletion %T: %v", bc.msg, err)
select {
Expand All @@ -742,7 +742,8 @@ func (m *Miner) handleBFGCallCompletion(parrentCtx context.Context, conn *protoc
select {
case bc.ch <- payload:
log.Tracef("handleBFGCallCompletion returned: %v", spew.Sdump(payload))
default:
case <-time.After(m.requestTimeout):
Comment thread
ClaytonNorthey92 marked this conversation as resolved.
log.Errorf("handleBFGCallCompletion: response time out %v", cmd)
}
}

Expand Down
1 change: 0 additions & 1 deletion service/popm/popm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,6 @@ func createMockBFG(ctx context.Context, t *testing.T, publicKeys []string, keyst
}

for {
time.Sleep(50 * time.Millisecond)
command, id, _, err := bfgapi.Read(ctx, conn)
if err != nil {
if !errors.Is(ctx.Err(), context.Canceled) {
Expand Down