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

get_signatures_for_address does not correctly account for result sets that span local and Bigtable sources (backport #22115)#22167

Merged
CriesofCarrots merged 2 commits intov1.8from
mergify/bp/v1.8/pr-22115
Dec 29, 2021
Merged

get_signatures_for_address does not correctly account for result sets that span local and Bigtable sources (backport #22115)#22167
CriesofCarrots merged 2 commits intov1.8from
mergify/bp/v1.8/pr-22115

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 29, 2021

This is an automatic backport of pull request #22115 done by Mergify.
Cherry-pick of bac6821 has failed:

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

You are currently cherry-picking commit bac6821e1.
  (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:   rpc/src/rpc.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

… that span local and Bigtable sources (#22115)

* get_signatures_for_address does not correctly account for result sets that span Blockstore and Bigtable.

This causes Bigtable to return `RowNotFound` until the new tx is uploaded.

Check that `before` exists in Bigtable, and if not, set it to `None` to return the full data set.

References #21442
Closes #22110

* Differentiate between before sig not found and no newer signatures

* Dedupe bigtable results to account for potential upload race

Co-authored-by: Tyera Eulberg <tyera@solana.com>
(cherry picked from commit bac6821)

# Conflicts:
#	ledger/src/blockstore.rs
@mergify mergify Bot added the conflicts label Dec 29, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@CriesofCarrots
Copy link
Copy Markdown
Contributor

Merging on red; downstream-projects expected to fail

@CriesofCarrots CriesofCarrots merged commit 24b0fc8 into v1.8 Dec 29, 2021
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-22115 branch December 29, 2021 20:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants