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

Fix the enclave stream reconnect #1741

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Conversation

BedrockSquirrel
Copy link
Collaborator

Why this change is needed

Fix the reconnecting to live batch streaming from the enclave after a disconnect.

Currently there's a bug where the guardian receives back a nil channel if the reconnect fails, which it blocks on forever so it will never try to reconnect.

PR checks pre-merging

Please indicate below by ticking the checkbox that you have read and performed the required
PR checks

  • PR checks reviewed and performed

Copy link

coderabbitai bot commented Jan 10, 2024

Walkthrough

The update to the StreamL2Updates function within the enclave_client.go file involves a change in its return values. Instead of returning nil values, the function has been updated to return a channel, specifically batchChan, for streaming updates, alongside a cancel function that has no operation (no-op) defined.

Changes

File Summary
.../rpc/enclaverpc/enclave_client.go Modified StreamL2Updates to return batchChan and a no-op cancel function.

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-tests for this file.
  • 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 tests 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 from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @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.
  • The JSON schema for the configuration file is available here.
  • 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/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

Copy link

@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.

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between f72e986 and 3e32cba.
Files selected for processing (1)
  • go/host/rpc/enclaverpc/enclave_client.go (1 hunks)
Additional comments: 1
go/host/rpc/enclaverpc/enclave_client.go (1)
  • 494-495: The change to return a non-nil batchChan and a no-op cancel function in the StreamL2Updates method is a good approach to prevent the guardian from blocking indefinitely. This allows for continuous reconnection attempts after a streaming disconnection occurs.

@BedrockSquirrel BedrockSquirrel merged commit a41bff9 into main Jan 11, 2024
2 checks passed
@BedrockSquirrel BedrockSquirrel deleted the matt/fix-enclave-reconnect branch January 11, 2024 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants