kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use cache size to signal undecorated storage 

Kubernetes-commit: 8261d3d9a63f0972453f6503b62299a96ecee657
This commit is contained in:
Yassine TIJANI 2019-02-20 22:15:24 +01:00 committed by Kubernetes Publisher
parent 5eae03fa38
commit 72bd8c7a64
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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
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