Skip to content

v3.1: blockstore: Add fallback in mark_slot_dead_if_not_full() (backport of #12026)#12027

Open
mergify[bot] wants to merge 2 commits intov3.1from
mergify/bp/v3.1/pr-12026
Open

v3.1: blockstore: Add fallback in mark_slot_dead_if_not_full() (backport of #12026)#12027
mergify[bot] wants to merge 2 commits intov3.1from
mergify/bp/v3.1/pr-12026

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Apr 17, 2026

Problem

This method currently only checks the ShredInsertionTracker for a slot meta.

Summary of Changes

Fallback to the blockstore as an extra check if we don't find a meta in the tracker + add unit test


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

This method currently only checks the ShredInsertionTracker for a slot
meta; fallback to the blockstore as an extra check if we don't find a
meta in the tracker

(cherry picked from commit 9808d65)

# Conflicts:
#	ledger/src/blockstore.rs
@mergify mergify bot added the conflicts label Apr 17, 2026
@mergify mergify bot requested a review from a team as a code owner April 17, 2026 19:13
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Apr 17, 2026

Cherry-pick of 9808d65 has failed:

On branch mergify/bp/v3.1/pr-12026
Your branch is up to date with 'origin/v3.1'.

You are currently cherry-picking commit 9808d65b2.
  (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.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

BlockLocation doesn't exists in v3.1
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.

1 participant