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

feat: iavl async pruning #593

Merged
merged 3 commits into from
Apr 8, 2024
Merged

feat: iavl async pruning #593

merged 3 commits into from
Apr 8, 2024

Conversation

cool-develope
Copy link
Collaborator

@cool-develope cool-develope commented Apr 4, 2024

Description

  • introduce new interfaces SetCommitting and UnsetCommitting to block the pruning on the iavl side

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
  • added ! to 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
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • 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.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

Summary by CodeRabbit

  • New Features

    • Implemented asynchronous pruning to enhance performance.
    • Added functionality to mark store states as committing or not, improving transaction handling and state management.
  • Tests

    • Introduced delays in test scenarios to better simulate consensus processes and ensure accurate pruning behavior during commits.

Copy link

coderabbitai bot commented Apr 4, 2024

Walkthrough

The updates introduce enhanced control over committing operations across various store components in a blockchain context. A significant addition is the asynchronous pruning option for IAVL trees, aimed at improving performance. Methods for marking the store's committing status have been uniformly added across different store types, ensuring a consistent approach to handling the committing phase. This includes preparatory and concluding actions surrounding the commit operations, with test adjustments to accommodate the changes.

Changes

Files Change Summary
store/iavl/store.go, store/iavl/tree.go Introduced async pruning in IAVL trees and added methods for committing state management.
store/mem/store.go, store/transient/store.go Added methods to manage committing status in stores.
store/rootmulti/... Updated Commit method to manage committing status and modified tests for pruning with delays.
store/types/store.go, server/mock/store.go Added committing status methods to the Committer interface and multiStore struct respectively.

🐰✨
In the realm of code where trees grow tall,
A rabbit hopped, enhancing them all.
With a flip and a skip, it wove its spell,
Committing and pruning, it did quite well.
"To improve, to enhance," it sang with glee,
Leaving the forest as lively as can be.
🌳🚀✨

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.

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

store/rootmulti/store_test.go Show resolved Hide resolved
store/rootmulti/store_test.go Show resolved Hide resolved
Comment on lines +621 to +622
time.Sleep(150 * time.Millisecond)
ms.Commit()
Copy link

Choose a reason for hiding this comment

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

Avoid using time.Sleep in tests as it can introduce flakiness and increase test execution time.

- time.Sleep(150 * time.Millisecond)
+ // Suggestion: Find a more reliable method to simulate delays than using time.Sleep.

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
time.Sleep(150 * time.Millisecond)
ms.Commit()
// Suggestion: Find a more reliable method to simulate delays than using time.Sleep.
ms.Commit()

Comment on lines +454 to +456
rs.SetCommitting()
rs.lastCommitInfo = commitStores(version, rs.stores, rs.removalMap)
rs.UnsetCommitting()
Copy link

Choose a reason for hiding this comment

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

Consider adding error handling for SetCommitting and UnsetCommitting methods within the Commit method to ensure robustness in case these operations fail.

- rs.SetCommitting()
+ if err := rs.SetCommitting(); err != nil {
+     return types.CommitID{}, err
+ }
- rs.UnsetCommitting()
+ if err := rs.UnsetCommitting(); err != nil {
+     return types.CommitID{}, err
+ }

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
rs.SetCommitting()
rs.lastCommitInfo = commitStores(version, rs.stores, rs.removalMap)
rs.UnsetCommitting()
if err := rs.SetCommitting(); err != nil {
return types.CommitID{}, err
}
rs.lastCommitInfo = commitStores(version, rs.stores, rs.removalMap)
if err := rs.UnsetCommitting(); err != nil {
return types.CommitID{}, err
}

Comment on lines +483 to +493
func (rs *Store) SetCommitting() {
for _, store := range rs.stores {
store.SetCommitting()
}
}

// UnsetCommitting implements Committer/CommitStore.
func (rs *Store) UnsetCommitting() {
for _, store := range rs.stores {
store.UnsetCommitting()
}
Copy link

Choose a reason for hiding this comment

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

Implement error handling within the SetCommitting and UnsetCommitting methods to ensure that all stores successfully transition their committing status. Accumulate errors and return them if any occur.

func (rs *Store) SetCommitting() error {
+   var errAccum error
    for _, store := range rs.stores {
-       store.SetCommitting()
+       if err := store.SetCommitting(); err != nil {
+           errAccum = multierror.Append(errAccum, err)
+       }
    }
+   return errAccum
}

func (rs *Store) UnsetCommitting() error {
+   var errAccum error
    for _, store := range rs.stores {
-       store.UnsetCommitting()
+       if err := store.UnsetCommitting(); err != nil {
+           errAccum = multierror.Append(errAccum, err)
+       }
    }
+   return errAccum
}

Note: This change assumes the existence of a multierror package to accumulate errors. If not available, consider implementing a similar mechanism or handling errors appropriately.


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
func (rs *Store) SetCommitting() {
for _, store := range rs.stores {
store.SetCommitting()
}
}
// UnsetCommitting implements Committer/CommitStore.
func (rs *Store) UnsetCommitting() {
for _, store := range rs.stores {
store.UnsetCommitting()
}
func (rs *Store) SetCommitting() error {
var errAccum error
for _, store := range rs.stores {
if err := store.SetCommitting(); err != nil {
errAccum = multierror.Append(errAccum, err)
}
}
return errAccum
}
// UnsetCommitting implements Committer/CommitStore.
func (rs *Store) UnsetCommitting() error {
var errAccum error
for _, store := range rs.stores {
if err := store.UnsetCommitting(); err != nil {
errAccum = multierror.Append(errAccum, err)
}
}
return errAccum
}

Comment on lines +484 to +486
for _, store := range rs.stores {
store.SetCommitting()
}

Check warning

Code scanning / CodeQL

Iteration over map Warning

Iteration over map may be a possible source of non-determinism
Comment on lines +491 to +493
for _, store := range rs.stores {
store.UnsetCommitting()
}

Check warning

Code scanning / CodeQL

Iteration over map Warning

Iteration over map may be a possible source of non-determinism
@osmosis-labs osmosis-labs deleted a comment from nicolaslara Apr 5, 2024
Copy link
Member

@czarcas7ic czarcas7ic left a comment

Choose a reason for hiding this comment

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

This feat is going to be merged upstream. We tested against Osmosis v23 mainnet and it seems to have fixed the issue of nodes halting for pruning

@czarcas7ic czarcas7ic merged commit 0a12f99 into osmo/v0.47.5 Apr 8, 2024
23 checks passed
@czarcas7ic czarcas7ic deleted the feat/deferred_pruning branch April 8, 2024 21:52
mergify bot pushed a commit that referenced this pull request Apr 8, 2024
* iavl async pruning

* go mod tidy

---------

Co-authored-by: Adam Tucker <[email protected]>
(cherry picked from commit 0a12f99)

# Conflicts:
#	go.mod
#	go.sum
#	simapp/go.mod
#	simapp/go.sum
#	store/iavl/store.go
#	tests/go.mod
#	tests/go.sum
mergify bot pushed a commit that referenced this pull request Apr 8, 2024
* iavl async pruning

* go mod tidy

---------

Co-authored-by: Adam Tucker <[email protected]>
(cherry picked from commit 0a12f99)
mergify bot pushed a commit that referenced this pull request Apr 8, 2024
* iavl async pruning

* go mod tidy

---------

Co-authored-by: Adam Tucker <[email protected]>
(cherry picked from commit 0a12f99)
czarcas7ic pushed a commit that referenced this pull request Apr 8, 2024
* iavl async pruning

* go mod tidy

---------

Co-authored-by: Adam Tucker <[email protected]>
(cherry picked from commit 0a12f99)

Co-authored-by: cool-developer <[email protected]>
czarcas7ic pushed a commit that referenced this pull request Apr 8, 2024
* iavl async pruning

* go mod tidy

---------

Co-authored-by: Adam Tucker <[email protected]>
(cherry picked from commit 0a12f99)

Co-authored-by: cool-developer <[email protected]>
czarcas7ic added a commit that referenced this pull request Apr 9, 2024
czarcas7ic added a commit that referenced this pull request May 9, 2024
* iavl async pruning

* go mod tidy

---------

Co-authored-by: Adam Tucker <[email protected]>
czarcas7ic pushed a commit that referenced this pull request May 10, 2024
* iavl async pruning

* go mod tidy

---------

Co-authored-by: Adam Tucker <[email protected]>

go mod iavl v1.1.3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants