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

Add Concurrent.usable_processor_count that is cgroups aware #1038

Merged
merged 3 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 65 additions & 0 deletions lib/concurrent-ruby/concurrent/utility/processor_counter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class ProcessorCounter
def initialize
@processor_count = Delay.new { compute_processor_count }
@physical_processor_count = Delay.new { compute_physical_processor_count }
@cpu_quota = Delay.new { compute_cpu_quota }
end

def processor_count
Expand All @@ -21,6 +22,25 @@ def physical_processor_count
@physical_processor_count.value
end

def available_processor_count
cpu_count = processor_count.to_f
quota = cpu_quota
eregon marked this conversation as resolved.
Show resolved Hide resolved

return cpu_count if quota.nil?

# cgroup cpus quotas have no limits, so they can be set to higher than the
# real count of cores.
if quota > cpu_count
eregon marked this conversation as resolved.
Show resolved Hide resolved
cpu_count
else
quota
end
end

def cpu_quota
@cpu_quota.value
end

private

def compute_processor_count
Expand Down Expand Up @@ -60,6 +80,24 @@ def compute_physical_processor_count
rescue
return 1
end

def compute_cpu_quota
if RbConfig::CONFIG["target_os"].match(/linux/i)
eregon marked this conversation as resolved.
Show resolved Hide resolved
if File.exist?("/sys/fs/cgroup/cpu.max")
# cgroups v2: https://docs.kernel.org/admin-guide/cgroup-v2.html#cpu-interface-files
cpu_max = File.read("/sys/fs/cgroup/cpu.max")
return nil if cpu_max.start_with?("max ") # no limit
max, period = cpu_max.split.map(&:to_f)
max / period
elsif File.exist?("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us")
# cgroups v1: https://kernel.googlesource.com/pub/scm/linux/kernel/git/glommer/memcg/+/cpu_stat/Documentation/cgroups/cpu.txt
max = File.read("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us").to_i
return nil if max == 0
period = File.read("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_period_us").to_f
max / period
end
end
end
end
end

Expand Down Expand Up @@ -107,4 +145,31 @@ def self.processor_count
def self.physical_processor_count
processor_counter.physical_processor_count
end

# Number of processors cores available for process scheduling.
# Returns `nil` if there is no #cpu_quota, or a `Float` if the
# process is inside a cgroup with a dedicated CPU quota (typically Docker).
#
# For performance reasons the calculated value will be memoized on the first
# call.
#
# @return [nil, Float] number of available processors seen by the OS or Java runtime
eregon marked this conversation as resolved.
Show resolved Hide resolved
def self.available_processor_count
processor_counter.available_processor_count
end

# The maximun number of processors cores available for process scheduling.
eregon marked this conversation as resolved.
Show resolved Hide resolved
# Returns `nil` if there is no enforced limit, or a `Float` if the
# process is inside a cgroup with a dedicated CPU quota (typically Docker).
#
# Note that nothing prevent to set a CPU quota higher than the actual number of
# cores on the system.
#
# For performance reasons the calculated value will be memoized on the first
# call.
#
# @return [nil, Float] Maximum number of available processors seen by the OS or Java runtime
eregon marked this conversation as resolved.
Show resolved Hide resolved
def self.cpu_quota
casperisfine marked this conversation as resolved.
Show resolved Hide resolved
processor_counter.cpu_quota
end
eregon marked this conversation as resolved.
Show resolved Hide resolved
end
75 changes: 75 additions & 0 deletions spec/concurrent/utility/processor_count_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,79 @@ module Concurrent
expect(Concurrent::physical_processor_count).to be >= 1
end
end

RSpec.describe '#cpu_quota' do

let(:counter) { Concurrent::Utility::ProcessorCounter.new }

it 'returns #compute_cpu_quota' do
expect(Concurrent::cpu_quota).to be == counter.cpu_quota
end

it 'returns nil if no quota is detected' do
if RbConfig::CONFIG["target_os"].match(/linux/i)
eregon marked this conversation as resolved.
Show resolved Hide resolved
expect(File).to receive(:exist?).twice.and_return(nil) # Checks for cgroups V1 and V2
end
expect(counter.cpu_quota).to be_nil
end

it 'returns nil if cgroups v2 sets no limit' do
expect(RbConfig::CONFIG).to receive(:[]).with("target_os").and_return("linux")
expect(File).to receive(:exist?).with("/sys/fs/cgroup/cpu.max").and_return(true)
expect(File).to receive(:read).with("/sys/fs/cgroup/cpu.max").and_return("max 100000\n")
expect(counter.cpu_quota).to be_nil
end

it 'returns a float if cgroups v2 sets a limit' do
expect(RbConfig::CONFIG).to receive(:[]).with("target_os").and_return("linux")
expect(File).to receive(:exist?).with("/sys/fs/cgroup/cpu.max").and_return(true)
expect(File).to receive(:read).with("/sys/fs/cgroup/cpu.max").and_return("150000 100000\n")
expect(counter.cpu_quota).to be == 1.5
end

it 'returns nil if cgroups v1 sets no limit' do
expect(RbConfig::CONFIG).to receive(:[]).with("target_os").and_return("linux")
expect(File).to receive(:exist?).with("/sys/fs/cgroup/cpu.max").and_return(false)
expect(File).to receive(:exist?).with("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us").and_return(true)

expect(File).to receive(:read).with("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us").and_return("max\n")
expect(counter.cpu_quota).to be_nil
end

it 'returns a float if cgroups v1 sets a limit' do
expect(RbConfig::CONFIG).to receive(:[]).with("target_os").and_return("linux")
expect(File).to receive(:exist?).with("/sys/fs/cgroup/cpu.max").and_return(false)
expect(File).to receive(:exist?).with("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us").and_return(true)

expect(File).to receive(:read).with("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us").and_return("150000\n")
expect(File).to receive(:read).with("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_period_us").and_return("100000\n")
expect(counter.cpu_quota).to be == 1.5
end

end

RSpec.describe '#available_processor_count' do

it 'returns #processor_count if #cpu_quota is nil' do
expect(Concurrent::processor_counter).to receive(:cpu_quota).and_return(nil)
available_processor_count = Concurrent::available_processor_count
eregon marked this conversation as resolved.
Show resolved Hide resolved
expect(available_processor_count).to be == Concurrent::processor_count
expect(available_processor_count).to be_a Float
end

it 'returns #processor_count if #cpu_quota is higher' do
expect(Concurrent::processor_counter).to receive(:cpu_quota).and_return(Concurrent::processor_count.to_f * 2)
available_processor_count = Concurrent::available_processor_count
eregon marked this conversation as resolved.
Show resolved Hide resolved
expect(available_processor_count).to be == Concurrent::processor_count
expect(available_processor_count).to be_a Float
end

it 'returns #cpu_quota if #cpu_quota is lower than #processor_count' do
expect(Concurrent::processor_counter).to receive(:cpu_quota).and_return(Concurrent::processor_count.to_f / 2)
available_processor_count = Concurrent::available_processor_count
eregon marked this conversation as resolved.
Show resolved Hide resolved
expect(available_processor_count).to be == Concurrent::processor_count.to_f / 2
expect(available_processor_count).to be_a Float
end

end
end