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(store/v2): fix the pebbledb storage implementation #21837

Merged
merged 6 commits into from
Sep 23, 2024

Conversation

cool-develope
Copy link
Contributor

@cool-develope cool-develope commented Sep 20, 2024

Description

Closes: #21642

While debugging it, found two following issues.

  • fix earliestVersion from 1 initially to 0
  • fix the initial iterator to reflect the tombstones

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title, you can find examples of the prefixes below:
  • confirmed ! in the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • updated the relevant documentation or specification, including comments for documenting Go code
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

Summary by CodeRabbit

  • New Features

    • Enhanced database functions to retrieve the earliest version, improving data integrity.
    • Improved iterator behavior to skip tombstoned entries, ensuring accurate data iteration.
  • Bug Fixes

    • Added a test to verify the correct behavior of the database iterator when a key is deleted, ensuring reliable deletion functionality.

Copy link
Contributor

coderabbitai bot commented Sep 20, 2024

Walkthrough

Walkthrough

The changes in this pull request primarily focus on modifying the functionality of the New and NewWithDB functions in the pebbledb storage module. The retrieval of the prune height is replaced with the retrieval of the earliest version from the database. Additionally, an enhancement is made to the iterator behavior to skip tombstoned entries, and a new test is introduced to validate the deletion behavior of the database iterator.

Changes

Files Change Summary
store/v2/storage/pebbledb/db.go Updated New and NewWithDB functions to retrieve the earliest version instead of the prune height. Replaced getPruneHeight with getEarliestVersion, which calculates the earliest version based on the prune height plus one.
store/v2/storage/pebbledb/iterator.go Modified newPebbleDBIterator to skip tombstoned key/value pairs after positioning the cursor using SeekLT.
store/v2/storage/storage_test_suite.go Added TestDatabaseIterator_WithDelete to test the behavior of the database iterator when a key is deleted, ensuring correct entry counts before and after deletion.

Assessment against linked issues

Objective Addressed Explanation
Ensure the database can handle genesis state initialization without hanging (#21642)
Improve error handling related to database operations (#21642) Changes do not directly address error handling issues.

Possibly related PRs

Suggested labels

C:server/v2, C:server/v2 stf

Suggested reviewers

  • kocubinski
  • tac0turtle

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.

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

@cool-develope your pull request is missing a changelog!

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: 1

Review details

Configuration used: .coderabbit.yml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 763e4d6 and 190a98c.

Files selected for processing (3)
  • store/v2/storage/pebbledb/db.go (3 hunks)
  • store/v2/storage/pebbledb/iterator.go (1 hunks)
  • store/v2/storage/storage_test_suite.go (1 hunks)
Additional context used
Path-based instructions (3)
store/v2/storage/pebbledb/db.go (1)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.

store/v2/storage/pebbledb/iterator.go (1)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.

store/v2/storage/storage_test_suite.go (1)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.

Additional comments not posted (6)
store/v2/storage/pebbledb/iterator.go (1)

85-90: LGTM! The added check improves the iterator's behavior by skipping tombstoned entries.

The new condition itr.valid && itr.cursorTombstoned() ensures that if the iterator is valid but currently pointing to a tombstoned key/value pair, it advances to the next non-tombstoned entry using itr.Next().

This enhancement prevents the iterator from remaining stuck on deleted entries, thereby improving the integrity of the data being iterated over.

store/v2/storage/storage_test_suite.go (1)

488-513: LGTM!

The test function is well-structured and covers the expected behavior of the database iterator when a key is deleted. It follows the AAA pattern and uses helper functions to improve readability. The test naming is also consistent with the convention.

store/v2/storage/pebbledb/db.go (4)

71-73: Update to use getEarliestVersion function is appropriate

The change to retrieve the earliest version using getEarliestVersion(db) improves the initialization logic by accurately reflecting the earliest version available in the database.


78-78: Properly initializing earliestVersion field

Setting the earliestVersion during database initialization ensures correct tracking of the earliest version and helps prevent potential inconsistencies.


84-86: Consistent retrieval of earliestVersion in NewWithDB

The update to retrieve earliestVersion in the NewWithDB function and handling errors appropriately maintains consistency with the New function.

Also applies to: 91-91


383-383: Confirm the logic of incrementing pruneHeight by 1

In getEarliestVersion, adding 1 to binary.LittleEndian.Uint64(bz) calculates the earliestVersion based on pruneHeight + 1. Please verify that this logic aligns with the expected behavior, especially in scenarios where the pruneHeight is unset or zero, to avoid off-by-one errors.

Comment on lines +365 to +368
// getEarliestVersion returns the earliest version set in the database.
// It is calculated by prune height + 1. If the prune height is not set, it
// returns 0.
func getEarliestVersion(storage *pebble.DB) (uint64, error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Refine the documentation comment for getEarliestVersion

The documentation comment can be improved to adhere to Go's documentation conventions:

  • Start with the function name.
  • Use complete sentences.
  • Enclose variable names in backticks for clarity.

Apply this diff to enhance the comment:

-// getEarliestVersion returns the earliest version set in the database.
-// It is calculated by prune height + 1. If the prune height is not set, it
-// returns 0.
+// getEarliestVersion returns the earliest version set in the database.
+// It is calculated by adding 1 to the `pruneHeight`. If the `pruneHeight` is not set, it returns 0.
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. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// getEarliestVersion returns the earliest version set in the database.
// It is calculated by prune height + 1. If the prune height is not set, it
// returns 0.
func getEarliestVersion(storage *pebble.DB) (uint64, error) {
// getEarliestVersion returns the earliest version set in the database.
// It is calculated by adding 1 to the `pruneHeight`. If the `pruneHeight` is not set, it returns 0.
func getEarliestVersion(storage *pebble.DB) (uint64, error) {

Copy link
Member

@tac0turtle tac0turtle left a comment

Choose a reason for hiding this comment

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

tACK

Copy link

sonarcloud bot commented Sep 21, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: pebbledb SS backend hangs at init genesis
5 participants