blockstore: mark slot as dead on data shred merkle root conflict #3970
Conversation
AshwinSekar
force-pushed
the
always-insert-shred
branch
from
9d96140 to
e0f356d
Compare
AshwinSekar
changed the title
| 0, | ||
| false, | ||
| 0, | ||
| false, // merkle_variant |
There was a problem hiding this comment.
this test was broken, legacy shreds are dropped on all clusters
|
Backports to the stable branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. |
|
Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis. |
(cherry picked from commit 5564a94) # Conflicts: # ledger/src/blockstore.rs
(cherry picked from commit 5564a94) # Conflicts: # ledger/src/blockstore.rs
…t (backport of #3970) (#4074) * blockstore: mark slot as dead on data shred merkle root conflict (#3970) (cherry picked from commit 5564a94) # Conflicts: # ledger/src/blockstore.rs * fix conflicts --------- Co-authored-by: Ashwin Sekar <[email protected]> Co-authored-by: Ashwin Sekar <[email protected]>
…t (backport of #3970) (#4075) * blockstore: mark slot as dead on data shred merkle root conflict (#3970) (cherry picked from commit 5564a94) # Conflicts: # ledger/src/blockstore.rs * fix conflicts --------- Co-authored-by: Ashwin Sekar <[email protected]> Co-authored-by: Ashwin Sekar <[email protected]>
We need to mark the slot as dead to ensure that the bank is completed