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

Fix: StorageObjectCountTracker is nil, apf estimator got ObjectCountNotFoundErr 

Kubernetes-commit: 4abc2b387b188d694e369e05c08effce9d23e7e7
This commit is contained in:
chenk008 2024-04-08 11:09:27 +08:00 committed by Kubernetes Publisher
parent 69d05fc758
commit 70fb342c48
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/options/etcd.go
View File

@ -396,7 +396,7 @@ func (f *StorageFactoryRestOptionsFactory) GetRESTOptions(resource schema.GroupR
EnableGarbageCollection: f.Options.EnableGarbageCollection,
ResourcePrefix: f.StorageFactory.ResourcePrefix(resource),
CountMetricPollPeriod: f.Options.StorageConfig.CountMetricPollPeriod,
StorageObjectCountTracker: f.Options.StorageConfig.StorageObjectCountTracker,
StorageObjectCountTracker: storageConfig.StorageObjectCountTracker,
}
if f.Options.EnableWatchCache {

15
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")
}
}