Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hack to skip cleanup_dead_slots upon snapshot load (bp #8561) #8585

Merged
merged 2 commits into from
Mar 3, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 3, 2020

This is an automated backport of pull request #8561 done by Mergify.io

Cherry-pick of 5d9130a has failed:

On branch mergify/bp/v0.23/pr-8561
Your branch is up to date with 'origin/v0.23'.

You are currently cherry-picking commit 5d9130a3c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   ledger/src/snapshot_utils.rs
	modified:   runtime/src/bank.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   runtime/src/accounts_db.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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
  • @Mergifyio backports <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 simulator.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 3, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 3, 2020
@ryoqun
Copy link
Member

ryoqun commented Mar 3, 2020

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Mar 3, 2020

Command rebase: failure

Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Hack to skip cleanup_dead_slots upon snapshot load
Using index info to reconstruct a base tree...
M runtime/src/accounts_db.rs
Falling back to patching base and 3-way merge...
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
error: Failed to merge in the changes.
Patch failed at 0001 Hack to skip cleanup_dead_slots upon snapshot load
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: F7DE6

@ryoqun ryoqun closed this Mar 3, 2020
@ryoqun
Copy link
Member

ryoqun commented Mar 3, 2020

Wow, mergify failed hard... Recreating backporting PR....

@ryoqun
Copy link
Member

ryoqun commented Mar 3, 2020

@Mergifyio rebase

@ryoqun ryoqun reopened this Mar 3, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Mar 3, 2020

Command rebase: failure

Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Hack to skip cleanup_dead_slots upon snapshot load
Using index info to reconstruct a base tree...
M runtime/src/accounts_db.rs
Falling back to patching base and 3-way merge...
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
error: Failed to merge in the changes.
Patch failed at 0001 Hack to skip cleanup_dead_slots upon snapshot load
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: E6281

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 3, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 3, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to merge conflict

@ryoqun
Copy link
Member

ryoqun commented Mar 3, 2020

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Mar 3, 2020

Command rebase: failure

Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Hack to skip cleanup_dead_slots upon snapshot load
Using index info to reconstruct a base tree...
M runtime/src/accounts_db.rs
Falling back to patching base and 3-way merge...
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
error: Failed to merge in the changes.
Patch failed at 0001 Hack to skip cleanup_dead_slots upon snapshot load
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: 348D0

@ryoqun ryoqun added the automerge Merge this Pull Request automatically once CI passes label Mar 3, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 3, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 3, 2020
@solana-grimes solana-grimes merged commit d59d231 into v0.23 Mar 3, 2020
@codecov
Copy link

codecov bot commented Mar 3, 2020

Codecov Report

Merging #8585 into v0.23 will increase coverage by <.1%.
The diff coverage is 75.7%.

@@           Coverage Diff           @@
##           v0.23   #8585     +/-   ##
=======================================
+ Coverage   80.5%   80.5%   +<.1%     
=======================================
  Files        251     251             
  Lines      54705   54733     +28     
=======================================
+ Hits       44057   44080     +23     
- Misses     10648   10653      +5

This was referenced May 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants