public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unified Storage: Pass ns, group, resource to GetResourceStats instead of just namespace (#114050)

Browse Source 
* passes nsr to GetResourceStats instead of just namespace

* removes ns check

* fixes failing tests

* make update-workspace

* pass group and resource from rebuild request when getting resource stats
This commit is contained in:
owensmallwood
2025-11-18 13:05:21 -06:00
committed by GitHub
parent bf3de07147
commit 8dddff3ce4
12 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/resource/search.go
+23 -6
View File
@@ -245,7 +245,10 @@ func (s *searchSupport) ListManagedObjects(ctx context.Context, req *resourcepb.
}
rsp := &resourcepb.ListManagedObjectsResponse{}
stats, err := s.storage.GetResourceStats(ctx, req.Namespace, 0)
nsr := NamespacedResource{
Namespace: req.Namespace,
}
stats, err := s.storage.GetResourceStats(ctx, nsr, 0)
if err != nil {
rsp.Error = AsErrorResult(err)
return rsp, nil
@@ -286,7 +289,10 @@ func (s *searchSupport) ListManagedObjects(ctx context.Context, req *resourcepb.
func (s *searchSupport) CountManagedObjects(ctx context.Context, req *resourcepb.CountManagedObjectsRequest) (*resourcepb.CountManagedObjectsResponse, error) {
rsp := &resourcepb.CountManagedObjectsResponse{}
stats, err := s.storage.GetResourceStats(ctx, req.Namespace, 0)
nsr := NamespacedResource{
Namespace: req.Namespace,
}
stats, err := s.storage.GetResourceStats(ctx, nsr, 0)
if err != nil {
rsp.Error = AsErrorResult(err)
return rsp, nil
@@ -408,7 +414,10 @@ func (s *searchSupport) GetStats(ctx context.Context, req *resourcepb.ResourceSt
return rsp, nil
}
stats, err := s.storage.GetResourceStats(ctx, req.Namespace, 0)
nsr := NamespacedResource{
Namespace: req.Namespace,
}
stats, err := s.storage.GetResourceStats(ctx, nsr, 0)
if err != nil {
return &resourcepb.ResourceStatsResponse{
Error: AsErrorResult(err),
@@ -457,7 +466,7 @@ func (s *searchSupport) buildIndexes(ctx context.Context) (int, error) {
group := errgroup.Group{}
group.SetLimit(s.initWorkers)
stats, err := s.storage.GetResourceStats(ctx, "", s.initMinSize)
stats, err := s.storage.GetResourceStats(ctx, NamespacedResource{}, s.initMinSize)
if err != nil {
return 0, err
}
@@ -657,7 +666,12 @@ func (s *searchSupport) rebuildIndex(ctx context.Context, req rebuildRequest) {
// Get the correct value of size + RV for building the index. This is important for our Bleve
// backend to decide whether to build index in-memory or as file-based.
stats, err := s.storage.GetResourceStats(ctx, req.Namespace, 0)
nsr := NamespacedResource{
Namespace: req.Namespace,
Group: req.Group,
Resource: req.Resource,
}
stats, err := s.storage.GetResourceStats(ctx, nsr, 0)
if err != nil {
span.RecordError(fmt.Errorf("failed to get resource stats: %w", err))
l.Error("failed to get resource stats", "error", err)
@@ -750,7 +764,10 @@ func (s *searchSupport) getOrCreateIndex(ctx context.Context, key NamespacedReso
// Get correct value of size + RV for building the index. This is important for our Bleve
// backend to decide whether to build index in-memory or as file-based.
stats, err := s.storage.GetResourceStats(ctx, key.Namespace, 0)
nsr := NamespacedResource{
Namespace: key.Namespace,
}
stats, err := s.storage.GetResourceStats(ctx, nsr, 0)
if err != nil {
return nil, fmt.Errorf("failed to get resource stats: %w", err)
}