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

apiserver: protect registry cleanup against concurrent access

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-11-06 18:31:40 +01:00
parent 210626577b
commit a246d6f1d1
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package registry package registry
import ( import (
"sync"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@ -82,13 +84,23 @@ func StorageWithCacher(capacity int) generic.StorageDecorator {
// only from the test harness, so Register/Cleanup will be // only from the test harness, so Register/Cleanup will be
// no-op at runtime. // no-op at runtime.
var cleanupLock sync.Mutex
var cleanup []func() = nil var cleanup []func() = nil
func TrackStorageCleanup() { func TrackStorageCleanup() {
cleanupLock.Lock()
defer cleanupLock.Unlock()
if cleanup != nil {
panic("Conflicting storage tracking")
}
cleanup = make([]func(), 0) cleanup = make([]func(), 0)
} }
func RegisterStorageCleanup(fn func()) { func RegisterStorageCleanup(fn func()) {
cleanupLock.Lock()
defer cleanupLock.Unlock()
if cleanup == nil { if cleanup == nil {
return return
} }
@ -96,11 +108,12 @@ func RegisterStorageCleanup(fn func()) {
} }
func CleanupStorage() { func CleanupStorage() {
if cleanup == nil { cleanupLock.Lock()
return old := cleanup
} cleanup = nil
for _, d := range cleanup { cleanupLock.Unlock()
for _, d := range old {
d() d()
} }
cleanup = nil
} }