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

chore: bump sdk/iavl for async pruning (backport #7994) #8002

Merged
merged 4 commits into from
Apr 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 9, 2024

Closes: #XXX

What is the purpose of the change

We are noticing that some validators on IAVL v1 are missing blocks in the pruning interval, typically after epoch, due to larger blocks. This makes the pruning async, which should prevent these missed blocks from occurring.

Should be back ported to v23 IAVL v1 branch with tag v0.47.5-v23-osmo-9-iavl-v1

Testing and Verifying

Tested against osmosis mainet, and it unstuck a node that was pruning a large amount of blocks.


This is an automatic backport of pull request #7994 done by Mergify.

* bump sdk/iavl for async pruning

* update changelog

* update osmoutils iavl

* bump gomods

* Revert "bump gomods"

This reverts commit 85c29d0.

* iavl

* update go mods

* fix version

(cherry picked from commit 4b58243)

# Conflicts:
#	CHANGELOG.md
#	go.sum
@mergify mergify bot requested a review from mattverse as a code owner April 9, 2024 15:59
@mergify mergify bot added the conflicts label Apr 9, 2024
@mergify mergify bot requested a review from nicolaslara as a code owner April 9, 2024 15:59
Copy link
Contributor Author

mergify bot commented Apr 9, 2024

Cherry-pick of 4b58243 has failed:

On branch mergify/bp/v24.x/pr-7994
Your branch is up to date with 'origin/v24.x'.

You are currently cherry-picking commit 4b58243f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   go.mod
	modified:   osmomath/go.mod
	modified:   osmomath/go.sum
	modified:   osmoutils/go.mod
	modified:   osmoutils/go.sum
	modified:   x/epochs/go.mod
	modified:   x/epochs/go.sum
	modified:   x/ibc-hooks/go.mod
	modified:   x/ibc-hooks/go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor

github-actions bot commented Apr 9, 2024

Important Notice

This PR modifies an in-repo Go module. It is one of:

  • osmomath
  • osmoutils
  • x/ibc-hooks
  • x/epochs

The dependent Go modules, especially the root one, will have to be
updated to reflect the changes. Failing to do so might cause e2e to fail.

Please follow the instructions below:

  1. Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
  2. Provide the current branch name
  3. On success, confirm if an automated commit corretly updated the go.mod and go.sum files

Please let us know if you need any help.

@czarcas7ic czarcas7ic closed this Apr 9, 2024
@czarcas7ic czarcas7ic reopened this Apr 9, 2024
@czarcas7ic czarcas7ic merged commit 0021d38 into v24.x Apr 9, 2024
1 check passed
@czarcas7ic czarcas7ic deleted the mergify/bp/v24.x/pr-7994 branch April 9, 2024 18:30
czarcas7ic added a commit that referenced this pull request Apr 9, 2024
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.

1 participant