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.

Sign up for GitHub

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

Jump to bottom

fix: upgrade IAVL #10648

Merged
merged 3 commits into from
Dec 1, 2021
Merged

fix: upgrade IAVL #10648

merged 3 commits into from
Dec 1, 2021

Conversation

robert-zaremba
Copy link
Collaborator

Description

Bump IAVL to solve race condition bug.

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)

robert-zaremba
robert-zaremba commented Dec 1, 2021
View reviewed changes
CHANGELOG.md Outdated

## [v0.44.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.44.4) - 2021-11-25

### Improvements
* (x/upgrade) [\#10532](https://github.com/cosmos/cosmos-sdk/pull/10532) Add `keeper.DumpUpgradeInfoWithInfoToDisk` to include `Plan.Info` in the upgrade-info file.
* (store) [\#10544](https://github.com/cosmos/cosmos-sdk/pull/10544) Use the new IAVL iterator structure which significantly improves iterator performance.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

autoformatting

Copy link
Contributor

Choose a reason for hiding this comment

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

there's 2.4k lines autoformatting diff. Maybe we should revert that

@robert-zaremba robert-zaremba added C:Store dependencies Pull requests that update a dependency file T:Bug A:automerge Automatically merge PR once all prerequisites pass. labels Dec 1, 2021
amaury1093
amaury1093 reviewed Dec 1, 2021
View reviewed changes
Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

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

Why don't we merge this in master and backport?

@robert-zaremba
Copy link
Collaborator Author

Why don't we merge this in master and backport?

Because master depends on tendermint 0.35, and we will do 0.18 release for IAVL for that. We just need to run few load tests.

amaury1093
amaury1093 approved these changes Dec 1, 2021
View reviewed changes
Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

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

Because master depends on tendermint 0.35, and we will do 0.18 release for IAVL for that.

So right now the race condition is present on master, right? For me we can:

  • merge this in master
  • backport
  • when 0.18 is ready, create a new PR on master

But won't block, feel free to merge

CHANGELOG.md Outdated

## [v0.44.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.44.4) - 2021-11-25

### Improvements
* (x/upgrade) [\#10532](https://github.com/cosmos/cosmos-sdk/pull/10532) Add `keeper.DumpUpgradeInfoWithInfoToDisk` to include `Plan.Info` in the upgrade-info file.
* (store) [\#10544](https://github.com/cosmos/cosmos-sdk/pull/10544) Use the new IAVL iterator structure which significantly improves iterator performance.

Copy link
Contributor

Choose a reason for hiding this comment

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

there's 2.4k lines autoformatting diff. Maybe we should revert that

@robert-zaremba
Copy link
Collaborator Author

there's 2.4k lines autoformatting diff. Maybe we should revert that

because it was not linted correctly, I will revert.

@robert-zaremba
Copy link
Collaborator Author

Yes, in master we have a problem with IAVL, but master is using Tendermint v0.35, and IAVL 0.17.3 is using v0.34 - both technically are the same major release so I don't' think it will work.

@amaury1093
Copy link
Contributor

Got it 👍

@robert-zaremba robert-zaremba merged commit 72fb852 into release/v0.44.x Dec 1, 2021
@robert-zaremba robert-zaremba deleted the robert/0.44-iavl branch December 1, 2021 20:28
RavenXce pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Jan 7, 2022
@robert-zaremba @RavenXce
fix: upgrade IAVL (cosmos#10648)
b833b62 
* fix: upgrade IAVL

* changelog update

* revert markdown formatting
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
@robert-zaremba @JeancarloBarrios
fix: upgrade IAVL (cosmos#10648)
5dff1d7 
* fix: upgrade IAVL

* changelog update

* revert markdown formatting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tac0turtle tac0turtle tac0turtle approved these changes

@amaury1093 amaury1093 amaury1093 approved these changes

@aaronc aaronc Awaiting requested review from aaronc aaronc is a code owner

@alexanderbez alexanderbez Awaiting requested review from alexanderbez

Assignees
No one assigned
Labels
A:automerge Automatically merge PR once all prerequisites pass. C:Store dependencies Pull requests that update a dependency file T:Bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@robert-zaremba @amaury1093 @tac0turtle