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: rollback command don't actually delete multistore versions (backport: #11361) #11982

Closed
wants to merge 1 commit into from
Closed

fix: rollback command don't actually delete multistore versions (backport: #11361) #11982

wants to merge 1 commit into from

Conversation

yihuang
Copy link
Collaborator

@yihuang yihuang commented May 18, 2022 •
edited
Loading

Description

Closes: #11333

  • add unit tests
  • use LoadVersionForOverwriting
  • update tendermint dependency to 0.35.x release branch

Co-authored-by: Aleksandr Bezobchuk [email protected]

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)

@yihuang yihuang force-pushed the rollback-backport branch from 22dc1b6 to bd4ca73 Compare May 18, 2022 05:08
@yihuang yihuang mentioned this pull request May 18, 2022
Merged
11 tasks
@yihuang yihuang marked this pull request as draft May 18, 2022 06:30
yihuang
yihuang commented May 18, 2022
View reviewed changes
go.mod
@@ -131,3 +132,5 @@ replace (
// the following version across all dependencies.
google.golang.org/grpc => google.golang.org/grpc v1.33.2
)

replace github.com/tendermint/tendermint => github.com/yihuang/tendermint v0.34.14-0.20220518061324-81344ac9464d
Copy link
Collaborator Author

@yihuang yihuang May 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

upstream PR: tendermint/tendermint#8574
needed for the --delete-pending-block flag.

Copy link

Choose a reason for hiding this comment

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

@yihuang
Apologies for intruding into this wonderful space, but do you think --delete-pending-block is still needed in the upstream cosmos-sdk ? (AFAIK, it did not go into the upstream 51d2de5 )

The reason I'm asking is because it was highly useful for me when I cherry-picked it to allow akash rollback work (had to use that --delete-pending-block flag which was very helpful). :-)

More details in
cometbft/cometbft#1610

yihuang
yihuang commented May 18, 2022
View reviewed changes
server/rollback.go
}

if deletePendingBlock {
if err := deletePendingBlockIfExists(cfg); err != nil {
Copy link
Collaborator Author

@yihuang yihuang May 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

probably don't need this feature in 0.46, since all the nodes with be running with the tendermint version that "validate block before persisting".

but we do need this to handle the cases that happen in legacy nodes.

This was referenced May 20, 2022
Closed
Closed
@yihuang
Copy link
Collaborator Author

yihuang commented May 21, 2022

I've run this successfully on a Cronos production node, it take 10hours to run though.

@yihuang yihuang mentioned this pull request May 23, 2022
Open
amaury1093
amaury1093 suggested changes May 23, 2022
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.

there are 2 api breaking changes: LoadVersionForOverwriting and NewRollbackCmd, so I don't think we should backport.

@yihuang Is there a way to includde this PR without any API breaking change?

@yihuang
Copy link
Collaborator Author

yihuang commented May 23, 2022 •
edited
Loading

there are 2 api breaking changes: LoadVersionForOverwriting and NewRollbackCmd, so I don't think we should backport.

@yihuang Is there a way to includde this PR without any API breaking change?

LoadVersionForOverwriting is a new API, maybe we can avoid adding the method to the interface by casting to the actual type.
The change to NewRollbackCmd can be considered as a bug fix, because the current one don't work fully as expected.

@yihuang
rollback command don't actually delete multistore versions
614906d 
Closes: cosmos#11333

- add unit tests
- use LoadVersionForOverwriting
- update tendermint dependency to 0.35.x release branch

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

add flag --delete-pending-block

fix build

fix unit test

flushMetadata after rollback
@yihuang yihuang force-pushed the rollback-backport branch from e49cc20 to 614906d Compare May 23, 2022 11:25
@yihuang yihuang mentioned this pull request Jul 31, 2022
Merged
19 tasks
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2022

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale label Aug 8, 2022
@github-actions github-actions bot closed this Aug 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arno01 arno01 arno01 left review comments

@amaury1093 amaury1093 amaury1093 requested 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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yihuang @amaury1093 @arno01