-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Conversation
e159b00
to
bbf4bd4
Compare
Codecov Report
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 |
bbf4bd4
to
9ac39f6
Compare
This commit also includes #34091 |
There was a problem hiding this 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
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 |
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 |
backport is no longer necessary with the addition of #34174 |
reopen |
fecebc3
to
7a2ec68
Compare
* 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)
7a2ec68
to
6c8f344
Compare
This is an automatic backport of pull request #33979 done by Mergify.
Cherry-pick of e457c02 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com