Skip to content

Fix aggregator post-test panic. #964

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

Closed
winder wants to merge 1 commit into from
Closed

Fix aggregator post-test panic. #964

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
13 changes: 9 additions & 4 deletions aggregator/pkg/handlers/batch_write_commit_verifier_node_result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ import (
type BatchWriteCommitVerifierNodeResultHandler struct {
handler *WriteCommitVerifierNodeResultHandler
maxCommitVerifierNodeResultRequestsPerBatch int
wg sync.WaitGroup
}

func (h *BatchWriteCommitVerifierNodeResultHandler) Wait() {
h.wg.Wait()
}

func (h *BatchWriteCommitVerifierNodeResultHandler) logger(ctx context.Context) logger.SugaredLogger {
Expand All @@ -40,12 +45,12 @@ func (h *BatchWriteCommitVerifierNodeResultHandler) Handle(ctx context.Context,
responses := make([]*committeepb.WriteCommitteeVerifierNodeResultResponse, len(requests))
errors := NewBatchErrorArray(len(requests))

wg := sync.WaitGroup{}
h.wg = sync.WaitGroup{}

for i, r := range requests {
wg.Add(1)
h.wg.Add(1)
go func(i int, r *committeepb.WriteCommitteeVerifierNodeResultRequest) {
defer wg.Done()
defer h.wg.Done()
resp, err := h.handler.Handle(ctx, r)
if err != nil {
statusErr, ok := grpcstatus.FromError(err)
Expand All @@ -65,7 +70,7 @@ func (h *BatchWriteCommitVerifierNodeResultHandler) Handle(ctx context.Context,

done := make(chan struct{})
go func() {
wg.Wait()
h.wg.Wait()
close(done)
}()

Expand Down
3 changes: 3 additions & 0 deletions aggregator/pkg/handlers/batch_write_commit_verifier_node_result_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ func TestBatchWriteCommitCCVNodeDataHandler_BatchSizeValidation(t *testing.T) {

writeHandler := NewWriteCommitCCVNodeDataHandler(store, agg, mon, lggr, sig, time.Millisecond)
batchHandler := NewBatchWriteCommitVerifierNodeResultHandler(writeHandler, tc.maxBatchSize)
defer batchHandler.Wait() // ensure all goroutines finish before the test exits

requests := make([]*committeepb.WriteCommitteeVerifierNodeResultRequest, tc.numRequests)
for i := range requests {
Expand Down Expand Up @@ -143,6 +144,7 @@ func TestBatchWriteCommitCCVNodeDataHandler_MixedSuccessAndInvalidArgument(t *te

writeHandler := NewWriteCommitCCVNodeDataHandler(store, agg, mon, lggr, sig, time.Millisecond)
batchHandler := NewBatchWriteCommitVerifierNodeResultHandler(writeHandler, 10)
defer batchHandler.Wait() // ensure all goroutines finish before the test exits

validReq := makeValidProtoRequest()
invalidReq := makeValidProtoRequest()
Expand Down Expand Up @@ -200,6 +202,7 @@ func TestBatchWriteCommitCCVNodeDataHandler_CancelledContextReturnsImmediately(t

writeHandler := NewWriteCommitCCVNodeDataHandler(store, agg, mon, lggr, sig, blockDuration)
batchHandler := NewBatchWriteCommitVerifierNodeResultHandler(writeHandler, 10)
defer batchHandler.Wait() // ensure all goroutines finish before the test exits

ctx, cancel := context.WithCancel(auth.ToContext(context.Background(), auth.CreateCallerIdentity(testCallerID, false)))
defer cancel()
Expand Down
Loading