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

v2.2: Revert "Thread manager instantiation in the validator (#4603)" (backport of #5132) #5156

Open
wants to merge 2 commits into
base: v2.2
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 5, 2025

This reverts commit e48672c.

Problem

It isn't clear if the thread manager is the way we want to go long term. We should get consensus amongst the team / testing / data that shows benefit (including worst case scenarios) before instantiating the object in production. At the present, we spin up 24 extra threads that are unused as far as I am aware.

Summary of Changes

This reverts the commit that create a ThreadManager in Validator; the code remains but unused by agave-validator


This is an automatic backport of pull request #5132 done by Mergify.

This reverts commit e48672c.

(cherry picked from commit 30c95ff)

# Conflicts:
#	programs/sbf/Cargo.lock
#	svm/examples/Cargo.lock
@mergify mergify bot requested a review from a team as a code owner March 5, 2025 17:42
@mergify mergify bot added the conflicts label Mar 5, 2025
@mergify mergify bot assigned steviez Mar 5, 2025
Copy link
Author

mergify bot commented Mar 5, 2025

Cherry-pick of 30c95ff has failed:

On branch mergify/bp/v2.2/pr-5132
Your branch is up to date with 'origin/v2.2'.

You are currently cherry-picking commit 30c95ff6e.
  (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/Cargo.toml
	modified:   core/src/validator.rs
	modified:   local-cluster/src/validator_configs.rs
	modified:   thread-manager/Cargo.toml
	modified:   thread-manager/examples/core_contention_basics.rs
	modified:   thread-manager/examples/core_contention_sweep.rs
	deleted:    thread-manager/src/config.rs
	deleted:    thread-manager/src/default_config.toml
	modified:   thread-manager/src/lib.rs
	modified:   thread-manager/src/native_thread_runtime.rs
	modified:   thread-manager/src/rayon_runtime.rs
	modified:   thread-manager/src/tokio_runtime.rs

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

t-nelson
t-nelson previously approved these changes Mar 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants