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

v1.17: Update upload_confirmed_blocks() return value when no blocks to upload (backport of #33861) #33882

Merged
merged 1 commit into from
Oct 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2023

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


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

#33861)

upload_confirmed_blocks() states that it will return the passed in
ending_slot when there are no blocks to upload. This is enforced in one
early return but not the other. The result is that BigTableUploadService
could potentially get stuck in a loop of trying to upload the same slot.

While this case seems to be caused when an operator restarts their node
without --no-snapshot-fetch (which can cause a gap in blockstore), we
can still be friendly and allow them to break out of this loop.

(cherry picked from commit a799a90)
@codecov
Copy link

codecov bot commented Oct 26, 2023

Codecov Report

Merging #33882 (b25dafd) into v1.17 (5fa23d9) will decrease coverage by 0.1%.
The diff coverage is 0.0%.

@@            Coverage Diff            @@
##            v1.17   #33882     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         804      804             
  Lines      217823   217823             
=========================================
- Hits       178300   178275     -25     
- Misses      39523    39548     +25     

@steviez steviez merged commit 84d5fff into v1.17 Oct 26, 2023
@steviez steviez deleted the mergify/bp/v1.17/pr-33861 branch October 26, 2023 18:11
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants