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

uses tikv_jemallocator::Jemalloc as the global allocator (backport #20149) #20166

Merged
merged 2 commits into from
Sep 24, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 24, 2021

This is an automatic backport of pull request #20149 done by Mergify.
Cherry-pick of 2cf081d has failed:

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

You are currently cherry-picking commit 2cf081d86.
  (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:   validator/Cargo.toml
	modified:   validator/src/main.rs

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

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/

#16346
switched default allocator from jemalloc to system allocator, but that
has shown regressions in form of higher ram usage causing nodes go OOM:
https://discord.com/channels/428295358100013066/439194979856809985/890413193858539580

This commit sets jemalloc as the default allocator.

(cherry picked from commit 2cf081d)

# Conflicts:
#	Cargo.lock
@mergify mergify bot added the conflicts label Sep 24, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 24, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Sep 24, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Sep 24, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 24, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Sep 24, 2021

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 Sep 24, 2021
@codecov
Copy link

codecov bot commented Sep 24, 2021

Codecov Report

Merging #20166 (38ae37a) into v1.7 (49a6acf) will increase coverage by 0.0%.
The diff coverage is 0.0%.

@@           Coverage Diff           @@
##             v1.7   #20166   +/-   ##
=======================================
  Coverage    82.2%    82.2%           
=======================================
  Files         440      440           
  Lines      125134   125157   +23     
=======================================
+ Hits       102896   102948   +52     
+ Misses      22238    22209   -29     

@mergify mergify bot merged commit 085f5f9 into v1.7 Sep 24, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-20149 branch September 24, 2021 17:38
behzadnouri added a commit to behzadnouri/solana that referenced this pull request Sep 24, 2021
…lana-labs#20149) (solana-labs#20166)

* uses tikv_jemallocator::Jemalloc as the global allocator (solana-labs#20149)

solana-labs#16346
switched default allocator from jemalloc to system allocator, but that
has shown regressions in form of higher ram usage causing nodes go OOM:
https://discord.com/channels/428295358100013066/439194979856809985/890413193858539580

This commit sets jemalloc as the default allocator.

(cherry picked from commit 2cf081d)

# Conflicts:
#	Cargo.lock

* removes backport merge conflicts

Co-authored-by: behzad nouri <[email protected]>
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