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

limits to data_header.size when combining shreds' payloads (backport #16708)#16870

Merged
mergify[bot] merged 2 commits intov1.6from
mergify/bp/v1.6/pr-16708
Apr 27, 2021
Merged

limits to data_header.size when combining shreds' payloads (backport #16708)#16870
mergify[bot] merged 2 commits intov1.6from
mergify/bp/v1.6/pr-16708

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Apr 27, 2021

This is an automatic backport of pull request #16708 done by Mergify.

Cherry-pick of 0f3ac51 has failed:

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

You are currently cherry-picking commit 0f3ac51cf.
  (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/replay_stage.rs

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

Shredder::deshred is ignoring data_header.size when combining shreds' payloads:
https://github.com/solana-labs/solana/blob/37b8587d4/ledger/src/shred.rs#L940-L961

Also adding more sanity checks on the alignment of data shreds indices.

(cherry picked from commit 0f3ac51)

# Conflicts:
#	ledger/src/shred.rs
@mergify mergify Bot added the conflicts label Apr 27, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Apr 27, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 27, 2021

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 Apr 27, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 27, 2021

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 Apr 27, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 27, 2021

Codecov Report

Merging #16870 (4ef2133) into v1.6 (7aec87c) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.6   #16870   +/-   ##
=======================================
  Coverage    82.7%    82.7%           
=======================================
  Files         416      416           
  Lines      114552   114551    -1     
=======================================
+ Hits        94814    94816    +2     
+ Misses      19738    19735    -3     

@mergify mergify Bot merged commit 5a3bf5c into v1.6 Apr 27, 2021
@mergify mergify Bot deleted the mergify/bp/v1.6/pr-16708 branch April 27, 2021 14:45
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant