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 Jun 4, 2021

This is an automatic backport of pull request #16697 done by Mergify.
Cherry-pick of 1f97b23 has failed:

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

You are currently cherry-picking commit 1f97b2365.
  (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:   Cargo.lock
	modified:   core/src/ledger_cleanup_service.rs
	modified:   core/src/validator.rs
	modified:   core/tests/ledger_cleanup.rs
	modified:   ledger/Cargo.toml
	modified:   ledger/src/blockstore.rs
	modified:   ledger/src/blockstore/blockstore_purge.rs
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/blockstore_db.rs

To fix up this pull request, you can check it out 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 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/

* Update rocksdb to v0.16.0

* Promote the infrequent and important log to info!

* Force background compaction by ttl without manual compaction

* Fix test

* Support no compaction mode in test_ledger_cleanup_compaction

* Fix comment

* Make compaction_interval customizable

* Avoid major compaction with periodic filtering...

* Adress lazy_static, special cfs and range check

* Clean up a bit and add comment

* Add comment

* More comments...

* Config code cleanup

* Add comment

* Use .conflicts_with()

* Nullify unneeded delete_range ops for special CFs

* Some clean ups

* Clarify the locking intention

* Ensure special CFs' consistency with PurgeType::CompactionFilter

* Fix comment

* Fix bad copy paste

* Fix various types...

* Don't use tuples

* Add a unit test for compaction_filter

* Fix typo...

* Remove flag and just use new behavior always

* Fix wrong condition negation...

* Doc. about no set_last_purged_slot in purge_slots

* Write a test and fix off-by-one bug....

* Apply suggestions from code review

Co-authored-by: Tyera Eulberg <[email protected]>

* Follow up to github review suggestions

* Fix line-wrapping

* Fix conflict

Co-authored-by: Tyera Eulberg <[email protected]>
(cherry picked from commit 1f97b23)

# Conflicts:
#	ledger/src/blockstore_db.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 4, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 4, 2021
@codecov
Copy link

codecov bot commented Jun 4, 2021

Codecov Report

Merging #17741 (7169ba8) into v1.7 (ae42413) will increase coverage by 0.0%.
The diff coverage is 93.2%.

@@           Coverage Diff            @@
##             v1.7   #17741    +/-   ##
========================================
  Coverage    82.6%    82.6%            
========================================
  Files         431      431            
  Lines      119718   119975   +257     
========================================
+ Hits        98941    99206   +265     
+ Misses      20777    20769     -8     

@mergify mergify bot merged commit 5e7db52 into v1.7 Jun 4, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-16697 branch June 4, 2021 14:38
ryoqun added a commit to ryoqun/solana that referenced this pull request Jun 11, 2021
@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.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants