scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86514 from yutedz/linear-rm-dead

Browse Source 
Perform dead storage removal linearly
This commit is contained in:
Kubernetes Prow Robot
2020-01-05 18:39:41 -08:00
committed by GitHub
parent 10dc4a0c79 9bc862ec69
commit 13b5effead
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
View File

@@ -526,29 +526,21 @@ func (r *crdHandler) removeDeadStorage() {
r.customStorageLock.Lock() r.customStorageLock.Lock()
defer r.customStorageLock.Unlock() defer r.customStorageLock.Unlock()
oldInfos := []*crdInfo{}
storageMap := r.customStorage.Load().(crdStorageMap) storageMap := r.customStorage.Load().(crdStorageMap)
// Copy because we cannot write to storageMap without a race // Copy because we cannot write to storageMap without a race
// as it is used without locking elsewhere storageMap2 := make(crdStorageMap)
storageMap2 := storageMap.clone()
for uid, s := range storageMap2 {
found := false
for _, crd := range allCustomResourceDefinitions { for _, crd := range allCustomResourceDefinitions {
if crd.UID == uid { if _, ok := storageMap[crd.UID]; ok {
found = true storageMap2[crd.UID] = storageMap[crd.UID]
break
}
}
if !found {
klog.V(4).Infof("Removing dead CRD storage for %s/%s", s.spec.Group, s.spec.Names.Kind)
oldInfos = append(oldInfos, s)
delete(storageMap2, uid)
} }
} }
r.customStorage.Store(storageMap2) r.customStorage.Store(storageMap2)
for _, s := range oldInfos { for uid, crdInfo := range storageMap {
go r.tearDown(s) if _, ok := storageMap2[uid]; !ok {
klog.V(4).Infof("Removing dead CRD storage for %s/%s", crdInfo.spec.Group, crdInfo.spec.Names.Kind)
go r.tearDown(crdInfo)
}
} }
} }