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.18: blockstore: store first received coding shred index in ErasureMeta (backport of #961) #981

Merged
merged 2 commits into from
Apr 23, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 22, 2024

Reuse the __unused_size : usize field in ErasureMeta to store the index of the first received coding shred for the FEC set.

Split from #835
Contributes to solana-labs#34897


This is an automatic backport of pull request #961 done by [Mergify](https://mergify.com).

Copy link
Author

mergify bot commented Apr 22, 2024

Cherry-pick of f133697 has failed:

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

You are currently cherry-picking commit f1336970d0.
  (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:   ledger/src/blockstore_meta.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

AshwinSekar and others added 2 commits April 22, 2024 19:18
)

* blockstore: store first received coding shred index in ErasureMeta

* pr feedback: use u64 instead of usize

(cherry picked from commit f133697)

# Conflicts:
#	ledger/src/blockstore_meta.rs
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.5%. Comparing base (5485ec1) to head (5485ec1).

❗ Current head 5485ec1 differs from pull request most recent head 1d69535. Consider uploading reports for the commit 1d69535 to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.18     #981   +/-   ##
=======================================
  Coverage    81.5%    81.5%           
=======================================
  Files         827      827           
  Lines      224853   224853           
=======================================
  Hits       183467   183467           
  Misses      41386    41386           

@AshwinSekar AshwinSekar merged commit c4e7b6b into v1.18 Apr 23, 2024
35 checks passed
@AshwinSekar AshwinSekar deleted the mergify/bp/v1.18/pr-961 branch April 23, 2024 14:32
anwayde pushed a commit to firedancer-io/agave that referenced this pull request Jul 23, 2024
…Meta (backport of anza-xyz#961) (anza-xyz#981)

* blockstore: store first received coding shred index in ErasureMeta (anza-xyz#961)

* blockstore: store first received coding shred index in ErasureMeta

* pr feedback: use u64 instead of usize

(cherry picked from commit f133697)

# Conflicts:
#	ledger/src/blockstore_meta.rs

* fix blockstore_meta conflict

---------

Co-authored-by: Ashwin Sekar <ashwin@anza.xyz>
Co-authored-by: Ashwin Sekar <ashwin@solana.com>
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