Skip to content

cpufreq_linux: fix race with cpu_linux collector for node_cpu_frequency_hertz metric #3756

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
jjegg01 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cpufreq_linux: fix race with cpu_linux collector for node_cpu_frequency_hertz metric #3756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 7 additions & 12 deletions collector/cpu_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,13 @@ func (c *cpuCollector) updateInfo(ch chan<- prometheus.Metric) error {
cpu.CacheSize)
}

cpuFreqEnabled, ok := collectorState["cpufreq"]
if !ok || cpuFreqEnabled == nil {
c.logger.Debug("cpufreq key missing or nil value in collectorState map")
} else if *cpuFreqEnabled {
for _, cpu := range info {
ch <- prometheus.MustNewConstMetric(c.cpuFrequencyHz,
prometheus.GaugeValue,
cpu.CPUMHz*1e6,
cpu.PhysicalID,
cpu.CoreID,
strconv.Itoa(int(cpu.Processor)))
}
for _, cpu := range info {
ch <- prometheus.MustNewConstMetric(c.cpuFrequencyHz,
prometheus.GaugeValue,
cpu.CPUMHz*1e6,
cpu.PhysicalID,
cpu.CoreID,
strconv.Itoa(int(cpu.Processor)))
}

if len(info) != 0 {
Expand Down
13 changes: 12 additions & 1 deletion collector/cpufreq_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,21 @@ func (c *cpuFreqCollector) Update(ch chan<- prometheus.Metric) error {
return err
}

// The current frequency metric is also provided by the cpuinfo-based collector.
// If that collector is enabled and set to provide frequency information,
// we skip this metric here (otherwise the two collectors would race for it)
cpuCollectorEnabled, ok := collectorState["cpu"]
skipCurrentFreq := false
if !ok || cpuCollectorEnabled == nil {
c.logger.Debug("cpu key missing or nil value in collectorState map")
} else {
skipCurrentFreq = *cpuCollectorEnabled && *enableCPUInfo
}

// sysfs cpufreq values are kHz, thus multiply by 1000 to export base units (hz).
// See https://www.kernel.org/doc/Documentation/cpu-freq/user-guide.txt
for _, stats := range cpuFreqs {
if stats.CpuinfoCurrentFrequency != nil {
if stats.CpuinfoCurrentFrequency != nil && !skipCurrentFreq {
ch <- prometheus.MustNewConstMetric(
cpuFreqHertzDesc,
prometheus.GaugeValue,
Expand Down
Loading