Fixed possible data race

iwankgb · dims · commit 09f7fba17a00 · 2025-06-05T10:49:58.000-04:00
diff --git a/manager/manager.go b/manager/manager.go
@@ -953,9 +953,12 @@ func (m *manager) createContainerLocked(containerName string, watchSource watche
 	}
 
 	if m.includedMetrics.Has(container.ResctrlMetrics) {
+		m.machineMu.Lock()
+		noOfNUMA := len(m.machineInfo.Topology)
+		m.machineMu.Unlock()
 		cont.resctrlCollector, err = m.resctrlManager.GetCollector(containerName, func() ([]string, error) {
 			return cont.getContainerPids(m.inHostNamespace)
-		}, len(m.machineInfo.Topology))
+		}, noOfNUMA)
 		if err != nil {
 			klog.V(4).Infof("resctrl metrics will not be available for container %s: %s", cont.info.Name, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -953,9 +953,12 @@ func (m *manager) createContainerLocked(containerName string, watchSource watche`
`953`	`953`	`}`
`954`	`954`
`955`	`955`	`if m.includedMetrics.Has(container.ResctrlMetrics) {`
	`956`	`+ m.machineMu.Lock()`
	`957`	`+ noOfNUMA := len(m.machineInfo.Topology)`
	`958`	`+ m.machineMu.Unlock()`
`956`	`959`	`cont.resctrlCollector, err = m.resctrlManager.GetCollector(containerName, func() ([]string, error) {`
`957`	`960`	`return cont.getContainerPids(m.inHostNamespace)`
`958`		`- }, len(m.machineInfo.Topology))`
	`961`	`+ }, noOfNUMA)`
`959`	`962`	`if err != nil {`
`960`	`963`	`klog.V(4).Infof("resctrl metrics will not be available for container %s: %s", cont.info.Name, err)`
`961`	`964`	`}`