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.

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

Consolidate orderbook updates into a single stream update #1634

Merged
merged 1 commit into from
Jun 6, 2024

Conversation

jayy04
Copy link
Contributor

@jayy04 jayy04 commented Jun 6, 2024

Changelist

[Describe or list the changes made in this PR]

Test Plan

[Describe how this PR was tested (if applicable)]

Author/Reviewer Checklist

  • If this PR has changes that result in a different app state given the same prior state and transaction list, manually add the state-breaking label.
  • If the PR has breaking postgres changes to the indexer add the indexer-postgres-breaking label.
  • If this PR isn't state-breaking but has changes that modify behavior in PrepareProposal or ProcessProposal, manually add the label proposal-breaking.
  • If this PR is one of many that implement a specific feature, manually label them all feature:[feature-name].
  • If you wish to for mergify-bot to automatically create a PR to backport your change to a release branch, manually add the label backport/[branch-name].
  • Manually add any of the following labels: refactor, chore, bug.

Summary by CodeRabbit

  • Refactor
    • Improved the efficiency of orderbook update handling by consolidating updates per subscription ID.
    • Enhanced the logic to ensure updates are sent to subscribers based on their subscription IDs.

Copy link
Contributor

coderabbitai bot commented Jun 6, 2024

Walkthrough

The changes to GrpcStreamingManagerImpl involve modifying the SendOrderbookUpdates method to handle orderbook updates by subscription ID rather than by CLOB pair ID. This includes switching the type of the updatesByClobPairId map to updatesBySubscriptionId and restructuring the logic to consolidate and send updates based on subscription IDs.

Changes

Files/Paths Change Summary
protocol/streaming/grpc/grpc_streaming_manager.go Updated SendOrderbookUpdates to use updatesBySubscriptionId map and added sendStreamUpdate method to handle updates by subscription ID.

Sequence Diagram(s) (Beta)

sequenceDiagram
    participant Client
    participant GrpcStreamingManagerImpl
    participant SubscriptionManager

    Client->>GrpcStreamingManagerImpl: SendOrderbookUpdates(updatesBySubscriptionId)
    GrpcStreamingManagerImpl->>SubscriptionManager: Consolidate updates by subscription ID
    SubscriptionManager-->>GrpcStreamingManagerImpl: Return consolidated updates
    GrpcStreamingManagerImpl->>Client: sendStreamUpdate(consolidated updates)
Loading

Poem

In the code where streams do flow,
Updates now by subs they go.
No more pairs, IDs we see,
Orderbooks update with glee.
A change so swift, a change so bright,
Streaming updates, day and night. 🌟


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

Outside diff range and nitpick comments (1)
protocol/streaming/grpc/grpc_streaming_manager.go (1)

Line range hint 205-230: Enhance error handling and resource cleanup.

The method sendStreamUpdate should handle errors more robustly. Currently, it only appends failed IDs for removal. Consider logging the error and ensuring that all resources are properly released.

- if err := subscription.srv.Send(&clobtypes.StreamOrderbookUpdatesResponse{Updates: streamUpdatesForSubscription}); err != nil {
-     idsToRemove = append(idsToRemove, id)
- }
+ if err := subscription.srv.Send(&clobtypes.StreamOrderbookUpdatesResponse{Updates: streamUpdatesForSubscription}); err != nil {
+     sm.logger.Error("Failed to send updates", log.ErrorKey, err)
+     idsToRemove = append(idsToRemove, id)
+     continue
+ }
Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 8911545 and 01171c8.

Files selected for processing (1)
  • protocol/streaming/grpc/grpc_streaming_manager.go (3 hunks)
Additional comments not posted (1)
protocol/streaming/grpc/grpc_streaming_manager.go (1)

125-147: Ensure thread safety when accessing shared resources.

The method SendOrderbookUpdates modifies updatesBySubscriptionId which is shared across different goroutines. This can lead to race conditions. Verify that appropriate locking mechanisms are used when accessing this map.

Comment on lines +116 to +123
updatesByClobPairId := make(map[uint32][]ocutypes.OffChainUpdateV1)
for clobPairId, update := range updates {
v1updates, err := GetOffchainUpdatesV1(update)
if err != nil {
panic(err)
}
updatesByClobPairId[clobPairId] = []clobtypes.StreamUpdate{
{
UpdateMessage: &clobtypes.StreamUpdate_OrderbookUpdate{
OrderbookUpdate: &clobtypes.StreamOrderbookUpdate{
Updates: v1updates,
Snapshot: snapshot,
updatesByClobPairId[clobPairId] = v1updates
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Refactor the error handling in GetOffchainUpdatesV1.

Currently, the method GetOffchainUpdatesV1 called within the loop can panic if an error occurs. This could lead to service instability. Consider handling the error more gracefully instead of using panic.

- if err != nil {
-     panic(err)
- }
+ if err != nil {
+     sm.logger.Error("Failed to get V1 updates", log.ErrorKey, err)
+     continue
+ }
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
updatesByClobPairId := make(map[uint32][]ocutypes.OffChainUpdateV1)
for clobPairId, update := range updates {
v1updates, err := GetOffchainUpdatesV1(update)
if err != nil {
panic(err)
}
updatesByClobPairId[clobPairId] = []clobtypes.StreamUpdate{
{
UpdateMessage: &clobtypes.StreamUpdate_OrderbookUpdate{
OrderbookUpdate: &clobtypes.StreamOrderbookUpdate{
Updates: v1updates,
Snapshot: snapshot,
updatesByClobPairId[clobPairId] = v1updates
}
updatesByClobPairId := make(map[uint32][]ocutypes.OffChainUpdateV1)
for clobPairId, update := range updates {
v1updates, err := GetOffchainUpdatesV1(update)
if err != nil {
sm.logger.Error("Failed to get V1 updates", log.ErrorKey, err)
continue
}
updatesByClobPairId[clobPairId] = v1updates
}

Comment on lines +188 to +200
updatesBySubscriptionId := make(map[uint32][]clobtypes.StreamUpdate)
for id, subscription := range sm.orderbookSubscriptions {
streamUpdatesForSubscription := make([]clobtypes.StreamUpdate, 0)
for _, clobPairId := range subscription.clobPairIds {
if update, ok := updatesByClobPairId[clobPairId]; ok {
streamUpdatesForSubscription = append(streamUpdatesForSubscription, update...)
}
}

updatesBySubscriptionId[id] = streamUpdatesForSubscription
}

sm.sendStreamUpdate(updatesBySubscriptionId)
Copy link
Contributor

Choose a reason for hiding this comment

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

Optimize the loop for better performance.

The nested loops in SendOrderbookFillUpdates can be optimized by reducing the scope of the inner loop. Consider precomputing a map from clobPairId to updates before iterating over subscriptions.

- for id, subscription := range sm.orderbookSubscriptions {
-     streamUpdatesForSubscription := make([]clobtypes.StreamUpdate, 0)
-     for _, clobPairId := range subscription.clobPairIds {
-         if update, ok := updatesByClobPairId[clobPairId]; ok {
-             streamUpdatesForSubscription = append(streamUpdatesForSubscription, update...)
-         }
-     }
-     updatesBySubscriptionId[id] = streamUpdatesForSubscription
- }
+ precomputedUpdates := make(map[uint32][]clobtypes.StreamUpdate)
+ for clobPairId, update := range updatesByClobPairId {
+     precomputedUpdates[clobPairId] = update
+ }
+ for id, subscription := range sm.orderbookSubscriptions {
+     for _, clobPairId := range subscription.clobPairIds {
+         if updates, ok := precomputedUpdates[clobPairId]; ok {
+             updatesBySubscriptionId[id] = append(updatesBySubscriptionId[id], updates...)
+         }
+     }
+ }
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
updatesBySubscriptionId := make(map[uint32][]clobtypes.StreamUpdate)
for id, subscription := range sm.orderbookSubscriptions {
streamUpdatesForSubscription := make([]clobtypes.StreamUpdate, 0)
for _, clobPairId := range subscription.clobPairIds {
if update, ok := updatesByClobPairId[clobPairId]; ok {
streamUpdatesForSubscription = append(streamUpdatesForSubscription, update...)
}
}
updatesBySubscriptionId[id] = streamUpdatesForSubscription
}
sm.sendStreamUpdate(updatesBySubscriptionId)
updatesBySubscriptionId := make(map[uint32][]clobtypes.StreamUpdate)
precomputedUpdates := make(map[uint32][]clobtypes.StreamUpdate)
for clobPairId, update := range updatesByClobPairId {
precomputedUpdates[clobPairId] = update
}
for id, subscription := range sm.orderbookSubscriptions {
for _, clobPairId := range subscription.clobPairIds {
if updates, ok := precomputedUpdates[clobPairId]; ok {
updatesBySubscriptionId[id] = append(updatesBySubscriptionId[id], updates...)
}
}
}
sm.sendStreamUpdate(updatesBySubscriptionId)

@jayy04
Copy link
Contributor Author

jayy04 commented Jun 6, 2024

@Mergifyio backport release/protocol/v5.x

Copy link
Contributor

mergify bot commented Jun 6, 2024

backport release/protocol/v5.x

✅ Backports have been created

@jayy04 jayy04 merged commit cd974a2 into main Jun 6, 2024
17 checks passed
@jayy04 jayy04 deleted the jy/fullnode-stream-snapshot-fix branch June 6, 2024 14:48
mergify bot pushed a commit that referenced this pull request Jun 6, 2024
(cherry picked from commit cd974a2)

# Conflicts:
#	protocol/streaming/grpc/grpc_streaming_manager.go
jayy04 added a commit that referenced this pull request Jun 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2 participants