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

chainntnfs: fix missing notifications #9258

Merged
merged 5 commits into from
Nov 19, 2024

Conversation

yyforyongyu
Copy link
Member

Cherry-picked commits from the final blockbeat to reduce the PR size.

This PR made two minor changes,

  1. we now always notify the txns first before the block, such that when the block arrives the relevant txn notification is also arrived.
  2. make sure the conf notification is non-blocking and always sent.

@yyforyongyu yyforyongyu added notifications bug fix flake fix size/micro small bug fix or feature, less than 15 mins of review, less than 250 labels Nov 12, 2024
@yyforyongyu yyforyongyu self-assigned this Nov 12, 2024
Copy link
Contributor

coderabbitai bot commented Nov 12, 2024

Important

Review skipped

Auto reviews are limited to specific labels.

🏷️ Labels to auto review (1)
  • llm-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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 using 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.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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
Collaborator

@guggero guggero left a comment

Choose a reason for hiding this comment

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

Nice fix!

if err != nil {
return nil, err
// Deliver the details to the conf set.
for _, ntfn := range confSet.ntfns {
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: don't shadow the outer ntfn name to make it more clear what notification we're notifying on?

Also, didn't look super deep into this, but could this lead to duplicate notifications? Probably not a big issue as we should always be able to handle duplicates.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Or is there only ever one notification being in rescan? My assumption is multiple of the set could be and then they would all notify. Perhaps I'm also misunderstanding things here.

Copy link
Member Author

Choose a reason for hiding this comment

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

nit: don't shadow the outer ntfn name to make it more clear what notification we're notifying on?

Done.

Or is there only ever one notification being in rescan? My assumption is multiple of the set could be and then they would all notify. Perhaps I'm also misunderstanding things here.

Yeah the water is a bit deep here, also not very confident about this package either😂 - I think the rescan is for every notification, which can def be optimized. As for duplicates, because the ntfn will be marked as dispatched=true and we will decide to notify or not by checking dispatched, I don't think we will see duplicates.

Copy link
Member Author

Choose a reason for hiding this comment

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

turns out the dispatched=true only protects the Confirmed notification. For the Updates notification, which sends the num of confs left (I think we never use it?), we may still have duplicates. To avoid the dups, I created a commit in the end to skip if the same update has already been sent before.

@yyforyongyu yyforyongyu requested a review from Roasbeef November 12, 2024 16:50
// We cannot rely on the subscriber to immediately read from
// the channel so we need to create a larger buffer to avoid
// blocking the notifier.
Confirmed: make(chan *TxConfirmation, numConfs),
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need a buffer of up to numConfs? Is this for some degenerate case where re-orgs constantly happen each time after a confirmation is notified?

Copy link
Member Author

Choose a reason for hiding this comment

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

Turns out the ntfn.Event.Confirmed is fine as we only send out the confirmed event once, although the pattern is still dangerous as one single failure in sending to the Confirmed channel can lead to blocking other notifications.

The channel in question is the ntfn.Event.Updates, and as it's not filtered by the dispatched variable, we may send duplicate notifications there. To fix this, I added a new commit at the end to skip sending the duplicates.

chainntnfs/txnotifier.go Show resolved Hide resolved
This commit changes the order of notifications when a relevant tx is
found in a block and now we will always notify the tx subscribers before
notifying the block, which has implications in the upcoming blockbeat.

When a block notification is subscribed via `RegisterBlockEpochNtfn` and
a confirm or spend is subscribed via `RegisterConfirmationsNtfn` or
`RegisterSpendNtfn`, we would always notify the block first before the
tx, causing the subsystem to think there's no relevant txns found in
this block, while the notifications are sent later. We now fix it by
always sending the txns notifications first, so the subsystem can
receive the txns, process them, then attempt to advance its state based
on the block received.
This commit fixes a bug where the confirmation details may be missed.
When the same tx is subscribed via `RegisterConfirmationsNtfn`, we will
put them into the same set and notify the whole set. However, this logic
is missing when performing the rescan - once the confirmation detail is
found, we only notify the current subscriber. Later we will skip
notifying other subscribers in `UpdateConfDetails` due to the
`confSet.details != nil` check. We now fix it by immediately notify all
the subscribers when the confirmation detail is found during the rescan.
So it's easier to handle the following commit where we start skipping
duplicate notifications.
This commit adds a new state to the `ConfNtfn` struct to start tracking
the number of confs left to be notified to avoid sending duplicate
notifications.
Copy link
Member

@Roasbeef Roasbeef left a comment

Choose a reason for hiding this comment

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

LGTM 🪔

@Roasbeef Roasbeef merged commit ab3b3c8 into lightningnetwork:master Nov 19, 2024
30 of 34 checks passed
@ziggie1984
Copy link
Collaborator

I think this has some diff marks in the release docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix flake fix notifications size/micro small bug fix or feature, less than 15 mins of review, less than 250
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants