github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116621 from moshe010/dra-lock

Browse Source 
kubelet dra: add lock to addCDIDevices
This commit is contained in:
Kubernetes Prow Robot 2023-03-14 19:27:28 -07:00 committed by GitHub
commit 74123a7341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pkg/kubelet/cm/dra/claiminfo.go
View File

@ -36,18 +36,40 @@ type ClaimInfo struct {
annotations []kubecontainer.Annotation annotations []kubecontainer.Annotation
} }
func (res *ClaimInfo) addPodReference(podUID types.UID) { func (info *ClaimInfo) addPodReference(podUID types.UID) {
res.Lock() info.Lock()
defer res.Unlock() defer info.Unlock()
res.PodUIDs.Insert(string(podUID)) info.PodUIDs.Insert(string(podUID))
} }
func (res *ClaimInfo) deletePodReference(podUID types.UID) { func (info *ClaimInfo) deletePodReference(podUID types.UID) {
res.Lock() info.Lock()
defer res.Unlock() defer info.Unlock()
res.PodUIDs.Delete(string(podUID)) info.PodUIDs.Delete(string(podUID))
}
func (info *ClaimInfo) addCDIDevices(pluginName string, cdiDevices []string) error {
info.Lock()
defer info.Unlock()
// NOTE: Passing CDI device names as annotations is a temporary solution
// It will be removed after all runtimes are updated
// to get CDI device names from the ContainerConfig.CDIDevices field
annotations, err := generateCDIAnnotations(info.ClaimUID, info.DriverName, cdiDevices)
if err != nil {
return fmt.Errorf("failed to generate container annotations, err: %+v", err)
}
if info.CDIDevices == nil {
info.CDIDevices = make(map[string][]string)
}
info.CDIDevices[pluginName] = cdiDevices
info.annotations = append(info.annotations, annotations...)
return nil
} }
// claimInfoCache is a cache of processed resource claims keyed by namespace + claim name. // claimInfoCache is a cache of processed resource claims keyed by namespace + claim name.
@ -72,25 +94,6 @@ func newClaimInfo(driverName, className string, claimUID types.UID, claimName, n
return &claimInfo return &claimInfo
} }
func (info *ClaimInfo) addCDIDevices(pluginName string, cdiDevices []string) error {
// NOTE: Passing CDI device names as annotations is a temporary solution
// It will be removed after all runtimes are updated
// to get CDI device names from the ContainerConfig.CDIDevices field
annotations, err := generateCDIAnnotations(info.ClaimUID, info.DriverName, cdiDevices)
if err != nil {
return fmt.Errorf("failed to generate container annotations, err: %+v", err)
}
if info.CDIDevices == nil {
info.CDIDevices = make(map[string][]string)
}
info.CDIDevices[pluginName] = cdiDevices
info.annotations = append(info.annotations, annotations...)
return nil
}
// newClaimInfoCache is a function that returns an instance of the claimInfoCache. // newClaimInfoCache is a function that returns an instance of the claimInfoCache.
func newClaimInfoCache(stateDir, checkpointName string) (*claimInfoCache, error) { func newClaimInfoCache(stateDir, checkpointName string) (*claimInfoCache, error) {
stateImpl, err := state.NewCheckpointState(stateDir, checkpointName) stateImpl, err := state.NewCheckpointState(stateDir, checkpointName)