Skip to content
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

Jump to bottom

[Access] Change SendAndSubscribe endpoint's MessageIndex to start at 0 #6598

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+17 −5
Open

[Access] Change SendAndSubscribe endpoint's MessageIndex to start at 0 #6598

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30d861c
Changed endpoints message index to start at 0
AndriiDiachuk Oct 28, 2024
2fb29f2
Merge branch 'master' into change-send-and-subscribe-endoints-msg-ind…
AndriiDiachuk Oct 29, 2024
74a7d98
Merge branch 'master' of github.com:AndriiDiachuk/flow-go into change…
AndriiDiachuk Oct 30, 2024
81bc3e5
Merge branch 'change-send-and-subscribe-endoints-msg-index-start-with…
AndriiDiachuk Oct 30, 2024
c41f135
Fixed integration test
AndriiDiachuk Oct 30, 2024
f9e3f2c
Merge branch 'master' into change-send-and-subscribe-endoints-msg-ind…
AndriiDiachuk Nov 4, 2024
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: 6 additions & 2 deletions access/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,15 +1435,19 @@ func (h *Handler) SendAndSubscribeTransactionStatuses(
messageIndex := counters.NewMonotonousCounter(0)
return subscription.HandleSubscription(sub, func(txResults []*TransactionResult) error {
for i := range txResults {
value := messageIndex.Increment()
index := messageIndex.Value()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and here


err = stream.Send(&access.SendAndSubscribeTransactionStatusesResponse{
TransactionResults: TransactionResultToMessage(txResults[i]),
MessageIndex: value,
MessageIndex: index,
})
if err != nil {
return rpc.ConvertError(err, "could not send response", codes.Internal)
}

if ok := messageIndex.Set(index + 1); !ok {
return status.Errorf(codes.Internal, "message index already incremented to %d", messageIndex.Value())
}
}

return nil
Expand Down
12 changes: 10 additions & 2 deletions engine/access/state_stream/backend/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ func (h *Handler) handleEventsResponse(send sendSubscribeEventsResponseFunc, hea
return status.Errorf(codes.Internal, "could not convert events to entity: %v", err)
}

index := messageIndex.Increment()
index := messageIndex.Value()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: keep the get and set together so the stream fails quickly if there's an issue

Suggested change
index := messageIndex.Value()
index := messageIndex.Value()
if ok := messageIndex.Set(index + 1); !ok {
return status.Errorf(codes.Internal, "message index already incremented to %d", messageIndex.Value())
}


err = send(&executiondata.SubscribeEventsResponse{
BlockHeight: resp.Height,
Expand All @@ -394,6 +394,10 @@ func (h *Handler) handleEventsResponse(send sendSubscribeEventsResponseFunc, hea
return rpc.ConvertError(err, "could not send response", codes.Internal)
}

if ok := messageIndex.Set(index + 1); !ok {
return status.Errorf(codes.Internal, "message index already incremented to %d", messageIndex.Value())
}

return nil
}
}
Expand Down Expand Up @@ -495,7 +499,7 @@ func (h *Handler) handleAccountStatusesResponse(
return err
}

index := messageIndex.Increment()
index := messageIndex.Value()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here


err = send(&executiondata.SubscribeAccountStatusesResponse{
BlockId: convert.IdentifierToMessage(resp.BlockID),
Expand All @@ -507,6 +511,10 @@ func (h *Handler) handleAccountStatusesResponse(
return rpc.ConvertError(err, "could not send response", codes.Internal)
}

if ok := messageIndex.Set(index + 1); !ok {
return status.Errorf(codes.Internal, "message index already incremented to %d", messageIndex.Value())
}

return nil
}
}
Expand Down
Loading