-
Notifications
You must be signed in to change notification settings - Fork 379
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
v2.2: rolls out chained Merkle shreds to 100% of mainnet slots (backport of #5088) #5098
base: v2.2
Are you sure you want to change the base?
Conversation
(cherry picked from commit 2f2dbd1)
ClusterType::Development => true, | ||
ClusterType::Devnet => true, | ||
// Roll out chained Merkle shreds to ~53% of mainnet slots. | ||
ClusterType::MainnetBeta => slot % 19 < 10, |
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.
for the backports, can we simply set this to true
? removal fine to ride master
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.
I don't see the point of keeping unused code around.
In particular, keeping more discrepancy between branches would introduce more risk if more changes are backported and they hit merge conflicts or something is missed out because the branches are different.
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.
i don't see the point of taking extra changes to stable
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.
avoiding unnecessary discrepancy between branches:
In particular, keeping more discrepancy between branches would introduce more risk if more changes are backported and they hit merge conflicts or something is missed out because the branches are different.
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.
we don't backport feature gate removals. this is the same class of change
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.
Backporting a feature gate removal will break ledger tool for slots across epoch-boundary that the feature was activated. And a feature gate removal does not need to be backported anyways. But we need to backport this change; so not sure how it makes them in the same class.
And I think keeping the backported change the same as the master branch is a better approach for the reasons mentioned earlier above. Unnecessarily causing them to digress is only asking for problems.
Problem
Incrementally rolling out chained Merkle shreds to mainnet.
Summary of Changes
The commit rolls out chained Merkle shreds to 100% of mainnet slots.
This is an automatic backport of pull request #5088 done by Mergify.