8000 Ignore rocksdb directories when unpacking genesis archive (backport #25575) by mergify[bot] · Pull Request #25670 · 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.

Ignore rocksdb directories when unpacking genesis archive (backport #25575) #25670

Merged
merged 1 commit into from
Jun 1, 2022

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented May 31, 2022

This is an automatic backport of pull request #25575 done by Mergify.
Cherry-pick of 6b2f581 has failed:

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

You are currently cherry-picking commit 6b2f58152.
  (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:   runtime/src/hardened_unpack.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

@mergify mergify bot added the conflicts label May 31, 2022
@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 May 31, 2022
@mergify
Copy link
Contributor Author
mergify bot commented May 31, 2022

automerge label removed due to a CI failure

Unpacking the rocksdb directory from genesis archive can have unintended
consequences, such as clobbering files in pre-existing rocksdb
directory.

(cherry picked from commit 6b2f581)
@steviez steviez force-pushed the mergify/bp/v1.9/pr-25575 branch from f6d012e to ed38e28 Compare May 31, 2022 23:36
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 31, 2022
@mergify
Copy link
Contributor Author
mergify bot commented Jun 1, 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 Jun 1, 2022
@mergify mergify bot merged commit 9f772a0 into v1.9 Jun 1, 2022
@mergify mergify bot deleted the mergify/bp/v1.9/pr-25575 branch June 1, 2022 01:57
@codecov
Copy link
codecov bot commented Jun 1, 2022

Codecov Report

Merging #25670 (ed38e28) into v1.9 (4481add) will increase coverage by 0.0%.
The diff coverage is 97.8%.

@@           Coverage Diff            @@
##             v1.9   #25670    +/-   ##
========================================
  Coverage    81.7%    81.8%            
========================================
  Files         533      533            
  Lines      149590   149680    +90     
========================================
+ Hits       122358   122513   +155     
+ Misses      27232    27167    -65     

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant
0