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

v1.17: add merkle root meta column to blockstore (backport of #33979) #34028

Merged
merged 2 commits into from
Dec 1, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2023

This is an automatic backport of pull request #33979 done by Mergify.
Cherry-pick of e457c02 has failed:

On branch mergify/bp/v1.17/pr-33979
Your branch is up to date with 'origin/v1.17'.

You are currently cherry-picking commit e457c02879.
  (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:   ledger/src/blockstore/blockstore_purge.rs
	modified:   ledger/src/blockstore_db.rs
	modified:   ledger/src/blockstore_meta.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/blockstore.rs

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Nov 12, 2023
@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.17/pr-33979 branch from e159b00 to bbf4bd4 Compare November 13, 2023 16:47
@AshwinSekar AshwinSekar requested a review from steviez November 13, 2023 17:00
Copy link

codecov bot commented Nov 13, 2023

Codecov Report

Merging #34028 (6c8f344) into v1.17 (fdaa4ca) will increase coverage by 0.0%.
Report is 1 commits behind head on v1.17.
The diff coverage is 57.1%.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #34028   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         803      803           
  Lines      218075   218103   +28     
=======================================
+ Hits       178467   178506   +39     
+ Misses      39608    39597   -11     

@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.17/pr-33979 branch from bbf4bd4 to 9ac39f6 Compare November 15, 2023 18:33
@AshwinSekar
Copy link
Contributor

This commit also includes #34091

behzadnouri
behzadnouri previously approved these changes Nov 15, 2023
Copy link
Contributor

@behzadnouri behzadnouri left a comment

Choose a reason for hiding this comment

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

lgtm, but please wait for Steve to confirm we are good to backport this to v1.17

@steviez
Copy link
Contributor

steviez commented Nov 16, 2023

Given #34124, I think we should hold off on this one a bit longer. We need that PR into a release so we can resume feature activations on both testnet and devnet

@steviez
Copy link
Contributor

steviez commented Nov 20, 2023

I think I have a change that will allow us to avoid this and the v1.16 backport (granted my change will also have to be backported): #34174.

That PR will make the software able to handle any unknown column that it finds in a rocksdb database. This is obviously better in that any new future columns can avoid the backports.

The change is fairly straight forward and I think I should be able to land it in master/v1.17/v1.16 early this week. I'll comment here when that happens, or, if that PR encounters a roadblock, I'll give my approval for your backports

@AshwinSekar
Copy link
Contributor

backport is no longer necessary with the addition of #34174

@mergify mergify bot deleted the mergify/bp/v1.17/pr-33979 branch November 29, 2023 19:52
@AshwinSekar AshwinSekar restored the mergify/bp/v1.17/pr-33979 branch December 1, 2023 01:16
@AshwinSekar
Copy link
Contributor

reopen

@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.17/pr-33979 branch 2 times, most recently from fecebc3 to 7a2ec68 Compare December 1, 2023 02:44
* add merkle root meta column to blockstore

* pr feedback: remove write/reads to column

* pr feedback: u64 -> u32 + revert

* pr feedback: fec_set_index u32, use Self::Index

* pr feedback: key size 16 -> 12

(cherry picked from commit e457c02)
@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.17/pr-33979 branch from 7a2ec68 to 6c8f344 Compare December 1, 2023 03:05
@AshwinSekar AshwinSekar added the automerge Merge this Pull Request automatically once CI passes label Dec 1, 2023
@mergify mergify bot merged commit da2dadd into v1.17 Dec 1, 2023
31 checks passed
@mergify mergify bot deleted the mergify/bp/v1.17/pr-33979 branch December 1, 2023 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants