Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

tracks erasure coding shreds indices explicitly (backport #21822)#22969

Merged
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21822
Feb 6, 2022
Merged

tracks erasure coding shreds indices explicitly (backport #21822)#22969
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21822

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 5, 2022

This is an automatic backport of pull request #21822 done by Mergify.
Cherry-pick of 65d59f4 has failed:

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

You are currently cherry-picking commit 65d59f4ef.
  (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:   core/src/broadcast_stage.rs
	modified:   core/src/broadcast_stage/broadcast_utils.rs
	modified:   core/src/broadcast_stage/standard_broadcast_run.rs
	modified:   core/src/shred_fetch_stage.rs
	modified:   gossip/src/duplicate_shred.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/benches/retransmit_stage.rs
	both modified:   core/benches/shredder.rs
	both modified:   core/src/broadcast_stage/broadcast_duplicates_run.rs
	both modified:   core/src/broadcast_stage/broadcast_fake_shreds_run.rs
	both modified:   core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
	both modified:   core/src/window_service.rs
	both modified:   ledger/src/blockstore.rs
	both modified:   ledger/src/shred.rs
	both modified:   ledger/tests/shred.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

The indices for erasure coding shreds are tied to data shreds:
https://github.com/solana-labs/solana/blob/90f41fd9b/ledger/src/shred.rs#L921

However with the upcoming changes to erasure schema, there will be more
erasure coding shreds than data shreds and we can no longer infer coding
shreds indices from data shreds.

The commit adds constructs to track coding shreds indices explicitly.

(cherry picked from commit 65d59f4)

# Conflicts:
#	core/benches/retransmit_stage.rs
#	core/benches/shredder.rs
#	core/src/broadcast_stage/broadcast_duplicates_run.rs
#	core/src/broadcast_stage/broadcast_fake_shreds_run.rs
#	core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
#	core/src/window_service.rs
#	ledger/src/blockstore.rs
#	ledger/src/shred.rs
#	ledger/tests/shred.rs
@mergify mergify Bot added the conflicts label Feb 5, 2022
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-21822 branch from 9dd6615 to 8af11eb Compare February 5, 2022 23:43
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-21822 branch from 8af11eb to 48e3405 Compare February 5, 2022 23:45
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 5, 2022
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 6, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 6, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 6, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 6, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 6, 2022

Codecov Report

Merging #22969 (48e3405) into v1.8 (89ec164) will increase coverage by 0.0%.
The diff coverage is 76.5%.

@@           Coverage Diff           @@
##             v1.8   #22969   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         464      464           
  Lines      131942   132000   +58     
=======================================
+ Hits       107770   107840   +70     
+ Misses      24172    24160   -12     

@mergify mergify Bot merged commit 1570026 into v1.8 Feb 6, 2022
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-21822 branch February 6, 2022 02:43
@github-actions
Copy link
Copy Markdown
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Mar 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants