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

use cache size to signal undecorated storage

Browse Source
This commit is contained in:
Yassine TIJANI 2019-02-20 22:15:24 +01:00
parent ee50d4784d
commit 8261d3d9a6
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/registry/cachesize/cachesize.go
View File

@ -39,6 +39,7 @@ func NewHeuristicWatchCacheSizes(expectedRAMCapacityMB int) map[schema.GroupReso
watchCacheSizes[schema.GroupResource{Resource: "nodes"}] = maxInt(5*clusterSize, 1000) watchCacheSizes[schema.GroupResource{Resource: "nodes"}] = maxInt(5*clusterSize, 1000)
watchCacheSizes[schema.GroupResource{Resource: "pods"}] = maxInt(50*clusterSize, 1000) watchCacheSizes[schema.GroupResource{Resource: "pods"}] = maxInt(50*clusterSize, 1000)
watchCacheSizes[schema.GroupResource{Resource: "services"}] = maxInt(5*clusterSize, 1000) watchCacheSizes[schema.GroupResource{Resource: "services"}] = maxInt(5*clusterSize, 1000)
watchCacheSizes[schema.GroupResource{Resource: "events"}] = 0
watchCacheSizes[schema.GroupResource{Resource: "apiservices", Group: "apiregistration.k8s.io"}] = maxInt(5*clusterSize, 1000) watchCacheSizes[schema.GroupResource{Resource: "apiservices", Group: "apiregistration.k8s.io"}] = maxInt(5*clusterSize, 1000)
return watchCacheSizes return watchCacheSizes
} }

4
pkg/registry/core/event/storage/storage.go
View File

@ -40,10 +40,6 @@ func NewREST(optsGetter generic.RESTOptionsGetter, ttl uint64) *REST {
panic(err) // TODO: Propagate error up panic(err) // TODO: Propagate error up
} }
// We explicitly do NOT do any decoration here - switching on Cacher
// for events will lead to too high memory consumption.
opts.Decorator = generic.UndecoratedStorage // TODO use watchCacheSize=-1 to signal UndecoratedStorage
store := &genericregistry.Store{ store := &genericregistry.Store{
NewFunc: func() runtime.Object { return &api.Event{} }, NewFunc: func() runtime.Object { return &api.Event{} },
NewListFunc: func() runtime.Object { return &api.EventList{} }, NewListFunc: func() runtime.Object { return &api.EventList{} },

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

@ -42,7 +42,7 @@ func StorageWithCacher(capacity int) generic.StorageDecorator {
triggerFunc storage.TriggerPublisherFunc) (storage.Interface, factory.DestroyFunc) { triggerFunc storage.TriggerPublisherFunc) (storage.Interface, factory.DestroyFunc) {
s, d := generic.NewRawStorage(storageConfig) s, d := generic.NewRawStorage(storageConfig)
if capacity == 0 { if capacity <= 0 {
klog.V(5).Infof("Storage caching is disabled for %T", objectType) klog.V(5).Infof("Storage caching is disabled for %T", objectType)
return s, d return s, d
} }

3
staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
View File

@ -229,6 +229,7 @@ func (f *SimpleRestOptionsFactory) GetRESTOptions(resource schema.GroupResource)
if !ok { if !ok {
cacheSize = f.Options.DefaultWatchCacheSize cacheSize = f.Options.DefaultWatchCacheSize
} }
// depending on cache size this might return an undecorated storage
ret.Decorator = genericregistry.StorageWithCacher(cacheSize) ret.Decorator = genericregistry.StorageWithCacher(cacheSize)
} }
return ret, nil return ret, nil
@ -262,6 +263,7 @@ func (f *StorageFactoryRestOptionsFactory) GetRESTOptions(resource schema.GroupR
if !ok { if !ok {
cacheSize = f.Options.DefaultWatchCacheSize cacheSize = f.Options.DefaultWatchCacheSize
} }
// depending on cache size this might return an undecorated storage
ret.Decorator = genericregistry.StorageWithCacher(cacheSize) ret.Decorator = genericregistry.StorageWithCacher(cacheSize)
} }
@ -285,7 +287,6 @@ func ParseWatchCacheSizes(cacheSizes []string) (map[schema.GroupResource]int, er
if size < 0 { if size < 0 {
return nil, fmt.Errorf("watch cache size cannot be negative: %s", c) return nil, fmt.Errorf("watch cache size cannot be negative: %s", c)
} }
watchCacheSizes[schema.ParseGroupResource(tokens[0])] = size watchCacheSizes[schema.ParseGroupResource(tokens[0])] = size
} }
return watchCacheSizes, nil return watchCacheSizes, nil