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.14: rolls out merkle shreds to ~5% of mainnet slots (backport of #32337) #32347

Merged
merged 2 commits into from
Jul 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2023

This is an automatic backport of pull request #32337 done by Mergify.
Cherry-pick of 43a5ed3 has failed:

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

You are currently cherry-picking commit 43a5ed3139.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 43a5ed3)

# Conflicts:
#	core/src/broadcast_stage/standard_broadcast_run.rs
@behzadnouri behzadnouri requested a review from jbiseda June 30, 2023 15:44
@jbiseda
Copy link
Contributor

jbiseda commented Jun 30, 2023

I thought v1.14 backports were limited to critical fixes. @willhickey

@behzadnouri
Copy link
Contributor

I thought v1.14 backports were limited to critical fixes. @willhickey

Merkle shreds are already shipped in v1.14.
The commit starts the incremental rollout process.

@willhickey
Copy link
Contributor

Merkle shreds are already shipped in v1.14. The commit starts the incremental rollout process.

I would rather avoid the cluster-specific code and have identical logic progress through testnet stabilization before going to mainnet-beta.

I think you've explained this before but I can't find it on Discord... is the rollout plan written down somewhere?

@behzadnouri
Copy link
Contributor

Merkle shreds are already shipped in v1.14. The commit starts the incremental rollout process.

I would rather avoid the cluster-specific code and have identical logic progress through testnet stabilization before going to mainnet-beta.

I think you've explained this before but I can't find it on Discord... is the rollout plan written down somewhere?

We went 5% -> 20% -> 100% rollout on testnet: #28199, #28905, #32316
and this commit starts replicating the same process on mainnet.

@codecov
Copy link

codecov bot commented Jun 30, 2023

Codecov Report

Merging #32347 (b79b1c9) into v1.14 (87ce9bb) will increase coverage by 0.0%.
The diff coverage is 75.0%.

@@           Coverage Diff           @@
##            v1.14   #32347   +/-   ##
=======================================
  Coverage    82.1%    82.1%           
=======================================
  Files         665      665           
  Lines      185418   185421    +3     
=======================================
+ Hits       152325   152340   +15     
+ Misses      33093    33081   -12     

Copy link
Contributor

@willhickey willhickey left a comment

Choose a reason for hiding this comment

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

Approved for v1.14 backport

@behzadnouri behzadnouri merged commit 021e8c4 into v1.14 Jul 5, 2023
@behzadnouri behzadnouri deleted the mergify/bp/v1.14/pr-32337 branch July 5, 2023 21:55
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.

3 participants