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

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2021

This is an automatic backport of pull request #19028 done by Mergify.
Cherry-pick of 3280ae3 has failed:

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

You are currently cherry-picking commit 3280ae3e9.
  (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:   core/src/validator.rs
	modified:   local-cluster/src/validator_configs.rs
	modified:   runtime/src/bank.rs
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   core/tests/snapshots.rs
	both modified:   ledger/src/bank_forks_utils.rs
	both modified:   ledger/src/blockstore_processor.rs
	deleted by us:   replica-node/src/replica_node.rs
	both modified:   runtime/src/snapshot_utils.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.io/

@mergify mergify bot added the conflicts label Aug 9, 2021
@mvines
Copy link
Contributor

mvines commented Aug 10, 2021

@Mergifyio rebase

* add validator option --accounts-db-skip-shrink

* typo

(cherry picked from commit 3280ae3)

# Conflicts:
#	core/tests/snapshots.rs
#	ledger/src/bank_forks_utils.rs
#	ledger/src/blockstore_processor.rs
#	replica-node/src/replica_node.rs
#	runtime/src/snapshot_utils.rs
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-19028 branch from 6e372cb to 53ffbf7 Compare August 10, 2021 01:58
@mergify
Copy link
Contributor Author

mergify bot commented Aug 10, 2021

Command rebase: success

Branch has been successfully rebased

@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 Aug 10, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Aug 10, 2021

automerge label removed due to a CI failure

@mvines
Copy link
Contributor

mvines commented Aug 10, 2021

halp merge conflicts

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 10, 2021
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-19028 branch from 87a3f04 to f7eee09 Compare August 10, 2021 06:21
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Aug 10, 2021
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@codecov
Copy link

codecov bot commented Aug 10, 2021

Codecov Report

Merging #19128 (f7eee09) into v1.7 (8934a39) will increase coverage by 0.0%.
The diff coverage is 79.3%.

@@           Coverage Diff            @@
##             v1.7   #19128    +/-   ##
========================================
  Coverage    82.3%    82.3%            
========================================
  Files         436      436            
  Lines      123156   123336   +180     
========================================
+ Hits       101360   101576   +216     
+ Misses      21796    21760    -36     

@jeffwashington
Copy link
Contributor

@CriesofCarrots I inspected the manual merge and the resulting full change. I also started a validator with this branch with and without the --accounts-db-skip-shrink option. All seems correct.

@CriesofCarrots CriesofCarrots merged commit 7584262 into v1.7 Aug 10, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-19028 branch August 10, 2021 16:29
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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.

5 participants