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

uses Option<Slot> for SlotMeta.parent_slot (backport #21808)#21899

Merged
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-21808
Dec 14, 2021
Merged

uses Option<Slot> for SlotMeta.parent_slot (backport #21808)#21899
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-21808

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 14, 2021

This is an automatic backport of pull request #21808 done by Mergify.
Cherry-pick of 8d980f0 has failed:

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

You are currently cherry-picking commit 8d980f07b.
  (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/repair_generic_traversal.rs
	modified:   core/src/serve_repair.rs
	modified:   ledger/src/ancestor_iterator.rs
	modified:   ledger/src/blockstore.rs
	modified:   ledger/src/blockstore_meta.rs
	modified:   local-cluster/tests/local_cluster.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger-tool/src/main.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

SlotMeta.parent_slot for the head of a detached chain of slots is
unknown and that is indicated by u64::MAX which lacks type-safety:
https://github.com/solana-labs/solana/blob/6c108c8fc/ledger/src/blockstore_meta.rs#L203-L205

The commit changes the type to Option<Slot>. Backward compatibility is
maintained by customizing serde serialize/deserialize implementations.

(cherry picked from commit 8d980f0)

# Conflicts:
#	ledger-tool/src/main.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 14, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 14, 2021
@solana-grimes
Copy link
Copy Markdown
Contributor

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

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 14, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 14, 2021

Codecov Report

Merging #21899 (717c99f) into v1.9 (a9d4728) will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##             v1.9   #21899     +/-   ##
=========================================
- Coverage    81.3%    81.3%   -0.1%     
=========================================
  Files         515      515             
  Lines      143700   143696      -4     
=========================================
- Hits       116845   116826     -19     
- Misses      26855    26870     +15     

@mergify mergify Bot merged commit a056fd8 into v1.9 Dec 14, 2021
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-21808 branch December 14, 2021 21:43
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 4, 2022

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 Apr 4, 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