8000 v1.17: Retry hash file allocation (backport of #33565) by mergify[bot] · Pull Request #33918 · solana-labs/solana · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

v1.17: Retry hash file allocation (backport of #33565) #33918

Merged
merged 2 commits into from
Oct 30, 2023

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Oct 28, 2023

This is an automatic backport of pull request #33565 done by Mergify.
Cherry-pick of 167dac2 has failed:

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

You are currently cherry-picking commit 167dac204f.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   accounts-db/src/accounts_hash.rs

no changes added to commit (use "git add" and/or "git commit -a")

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

* retry hash file allocation

* add sleep

* submit a datapoint for retry

* typo

* more typos

* Update accounts-db/src/accounts_hash.rs

Co-authored-by: Brooks <brooks@prumo.org>

* fmt

---------

Co-authored-by: HaoranYi <haoran.yi@solana.com>
Co-authored-by: Brooks <brooks@prumo.org>
(cherry picked from commit 167dac2)

# Conflicts:
#	accounts-db/src/accounts_hash.rs
@mergify mergify bot added the conflicts label Oct 28, 2023
@codecov
Copy link
codecov bot commented Oct 28, 2023

Codecov Report

Merging #33918 (0a94217) into v1.17 (b948b2b) will increase coverage by 0.0%.
The diff coverage is 57.6%.

@@           Coverage Diff           @@
##            v1.17   #33918   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         802      802           
  Lines      217619   217637   +18     
=======================================
+ Hits       178097   178143   +46     
+ Misses      39522    39494   -28     

Copy link
Contributor
@willhickey willhickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved for v1.17.

For posterity, one of the beta canaries hit this bug on 2023-10-27

@HaoranYi HaoranYi merged commit 2e5a20f into v1.17 Oct 30, 2023
@HaoranYi HaoranYi deleted the mergify/bp/v1.17/pr-33565 branch October 30, 2023 20:44
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…lana-labs#33918)

* Retry hash file allocation (solana-labs#33565)

* retry hash file allocation

* add sleep

* submit a datapoint for retry

* typo

* more typos

* Update accounts-db/src/accounts_hash.rs

Co-authored-by: Brooks <brooks@prumo.org>

* fmt

---------

Co-authored-by: HaoranYi <haoran.yi@solana.com>
Co-authored-by: Brooks <brooks@prumo.org>
(cherry picked from commit 167dac2)

# Conflicts:
#	accounts-db/src/accounts_hash.rs

* fix conflicts

---------

Co-authored-by: HaoranYi <haoran.yi@gmail.com>
Co-authored-by: HaoranYi <haoran.yi@solana.com>
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…lana-labs#33918)

* Retry hash file allocation (solana-labs#33565)

* retry hash file allocation

* add sleep

* submit a datapoint for retry

* typo

* more typos

* Update accounts-db/src/accounts_hash.rs

Co-authored-by: Brooks <brooks@prumo.org>

* fmt

---------

Co-authored-by: HaoranYi <haoran.yi@solana.com>
Co-authored-by: Brooks <brooks@prumo.org>
(cherry picked from commit 167dac2)

# Conflicts:
#	accounts-db/src/accounts_hash.rs

* fix conflicts

---------

Co-authored-by: HaoranYi <haoran.yi@gmail.com>
Co-authored-by: HaoranYi <haoran.yi@solana.com>
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
0