github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-12-06 16:48:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124223 from chenk008/fix_apf_countTracker

Browse Source 
Fix: EtcdOptions.StorageObjectCountTracker is nil, APF estimator got ObjectCountNotFoundErr
This commit is contained in:
Kubernetes Prow Robot
2024-04-19 01:56:35 -07:00
committed by GitHub
parent bf07ef3950 c5d0e59d45
commit 69b648a1d7
4 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,6 +399,10 @@ func (f *StorageFactoryRestOptionsFactory) GetRESTOptions(resource schema.GroupR
StorageObjectCountTracker: f.Options.StorageConfig.StorageObjectCountTracker,
}
if ret.StorageObjectCountTracker == nil {
ret.StorageObjectCountTracker = storageConfig.StorageObjectCountTracker
}
if f.Options.EnableWatchCache {
sizes, err := ParseWatchCacheSizes(f.Options.WatchCacheSizes)
if err != nil {

15
staging/src/k8s.io/apiserver/pkg/server/options/etcd_test.go
View File

@@ -430,3 +430,18 @@ func healthChecksAreEqual(t *testing.T, want []string, healthChecks []healthz.He
t.Errorf("%s checks are not equal, missing=%q, extra=%q", checkerType, wantSet.Difference(gotSet).List(), gotSet.Difference(wantSet).List())
}
}
func TestRestOptionsStorageObjectCountTracker(t *testing.T) {
serverConfig := server.NewConfig(codecs)
etcdOptions := &EtcdOptions{}
if err := etcdOptions.ApplyTo(serverConfig); err != nil {
t.Fatalf("Failed to apply etcd options error: %v", err)
}
restOptions, err := serverConfig.RESTOptionsGetter.GetRESTOptions(schema.GroupResource{Group: "", Resource: ""})
if err != nil {
t.Fatal(err)
}
if restOptions.StorageConfig.StorageObjectCountTracker != serverConfig.StorageObjectCountTracker {
t.Errorf("There are different StorageObjectCountTracker in restOptions and serverConfig")
}
}