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

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

Merged
merged 2 commits into from
Feb 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 4, 2022

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

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

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/serve_repair.rs
	modified:   ledger/src/ancestor_iterator.rs
	modified:   ledger/src/blockstore_meta.rs
	modified:   local-cluster/tests/local_cluster.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   core/src/repair_generic_traversal.rs
	both modified:   ledger-tool/src/main.rs
	both modified:   ledger/src/blockstore.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:
#	core/src/repair_generic_traversal.rs
#	ledger-tool/src/main.rs
#	ledger/src/blockstore.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 4, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 4, 2022
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-21808 branch from 20a0265 to ddf7a39 Compare February 4, 2022 14:35
@solana-grimes
Copy link
Contributor

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

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 4, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 4, 2022

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 Feb 4, 2022
@codecov
Copy link

codecov bot commented Feb 4, 2022

Codecov Report

Merging #22936 (ddf7a39) into v1.8 (430cdf6) will increase coverage by 0.0%.
The diff coverage is 99.2%.

@@           Coverage Diff            @@
##             v1.8   #22936    +/-   ##
========================================
  Coverage    81.6%    81.6%            
========================================
  Files         464      464            
  Lines      131755   131931   +176     
========================================
+ Hits       107623   107781   +158     
- Misses      24132    24150    +18     

@mergify mergify bot merged commit 86e369e into v1.8 Feb 4, 2022
@mergify mergify bot deleted the mergify/bp/v1.8/pr-21808 branch February 4, 2022 16:30
@github-actions
Copy link
Contributor

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 Mar 30, 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