github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-19 15:39:17 +00:00
Code Issues Projects Releases Wiki Activity

Move stats updates to getList

Browse Source 
Signed-off-by: Aleksander Mistewicz <amistewicz@google.com>
This commit is contained in:
Aleksander Mistewicz
2025-09-10 11:54:20 +02:00
parent aa38aeaca2
commit e9f61ce511
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
View File

@@ -778,8 +778,6 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
metrics.RecordStorageListMetrics(s.groupResource, numFetched, numEvald, numReturn)
}()
stats := s.getResourceSizeEstimator()
aggregator := s.listErrAggrFactory()
for {
getResp, err = s.getList(ctx, keyPrefix, opts.Recursive, kubernetes.ListOptions{
@@ -819,9 +817,6 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
} else {
growSlice(v, 2048, len(getResp.Kvs))
}
if stats != nil {
stats.Update(getResp.Kvs)
}
// take items from the response until the bucket is full, filtering as we go
for i, kv := range getResp.Kvs {
@@ -903,26 +898,31 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
return s.versioner.UpdateList(listObj, uint64(withRev), continueValue, remainingItemCount)
}
func (s *store) getList(ctx context.Context, keyPrefix string, recursive bool, options kubernetes.ListOptions) (kubernetes.ListResponse, error) {
func (s *store) getList(ctx context.Context, keyPrefix string, recursive bool, options kubernetes.ListOptions) (resp kubernetes.ListResponse, err error) {
startTime := time.Now()
if recursive {
resp, err := s.client.Kubernetes.List(ctx, keyPrefix, options)
resp, err = s.client.Kubernetes.List(ctx, keyPrefix, options)
metrics.RecordEtcdRequest("list", s.groupResource, err, startTime)
return resp, err
}
getResp, err := s.client.Kubernetes.Get(ctx, keyPrefix, kubernetes.GetOptions{
Revision: options.Revision,
})
metrics.RecordEtcdRequest("get", s.groupResource, err, startTime)
var resp kubernetes.ListResponse
if getResp.KV != nil {
resp.Kvs = []*mvccpb.KeyValue{getResp.KV}
resp.Count = 1
resp.Revision = getResp.Revision
} else {
resp.Kvs = []*mvccpb.KeyValue{}
resp.Count = 0
resp.Revision = getResp.Revision
var getResp kubernetes.GetResponse
getResp, err = s.client.Kubernetes.Get(ctx, keyPrefix, kubernetes.GetOptions{
Revision: options.Revision,
})
metrics.RecordEtcdRequest("get", s.groupResource, err, startTime)
if getResp.KV != nil {
resp.Kvs = []*mvccpb.KeyValue{getResp.KV}
resp.Count = 1
resp.Revision = getResp.Revision
} else {
resp.Kvs = []*mvccpb.KeyValue{}
resp.Count = 0
resp.Revision = getResp.Revision
}
}
stats := s.getResourceSizeEstimator()
if len(resp.Kvs) > 0 && stats != nil {
stats.Update(resp.Kvs)
}
return resp, err
}