Skip to content

Optionally skip container-aware CPU detection when fixed concurrency is specified #1582

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.

Sign up for GitHub

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

Open
tomjzzhang wants to merge 4 commits into
base: main
Choose a base branch
from
+8 −6
Open

Optionally skip container-aware CPU detection when fixed concurrency is specified #1582

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9fe766
Updating Envoy version to 4d6c488 (Aug 3, 2026)
tomjzzhang Aug 4, 2026
e914db9
Kick CI
tomjzzhang Aug 4, 2026
67404b1
Move Envoy::OptionsImplPlatform::getCpuCount() to only be executed if…
tomjzzhang Aug 7, 2026
a8cf2f5
Merge remote-tracking branch 'upstream/main' into cpu_count
tomjzzhang Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions source/client/process_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,17 @@ class BootstrapFactory : public Envoy::Logger::Loggable<Envoy::Logger::Id::main>
// Determines the concurrency Nighthawk should use based on configuration
// (options) and the available machine resources.
static uint32_t determineConcurrency(const Options& options) {
uint32_t cpu_cores_with_affinity = Envoy::OptionsImplPlatform::getCpuCount();
bool autoscale = options.concurrency() == "auto";
// TODO(oschaaf): Maybe, in the case where the concurrency flag is left out, but
// affinity is set / we don't have affinity with all cores, we should default to autoscale.
// (e.g. we are called via taskset).
uint32_t concurrency = autoscale ? cpu_cores_with_affinity : std::stoi(options.concurrency());

uint32_t concurrency;
if (autoscale) {
uint32_t cpu_cores_with_affinity = Envoy::OptionsImplPlatform::getCpuCount();
ENVOY_LOG(info, "Detected {} (v)CPUs with affinity..", cpu_cores_with_affinity);
concurrency = cpu_cores_with_affinity;
} else {
// TODO(oschaaf): Maybe, in the case where the concurrency flag is left out, but
// affinity is set / we don't have affinity with all cores, we should default to autoscale.
// (e.g. we are called via taskset).
concurrency = std::stoi(options.concurrency());
}
std::string duration_as_string =
options.noDuration() ? "No time limit"
Expand Down
Loading