Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cluster/calcium/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,11 @@ func (c *Calcium) ListPodNodes(ctx context.Context, opts *types.ListNodesOptions
logger.Error(ctx, err)
return nil, err
}
infos, err := c.rmgr.GetNodesResourceInfo(ctx, utils.Map(nodes, func(node *types.Node) string { return node.Name }))
if err != nil {
logger.Error(ctx, err, "failed to get nodes resource info")
var infos map[string]*types.NodeResourceInfo
if !opts.WithoutResourceInfo {
if infos, err = c.rmgr.GetNodesResourceInfo(ctx, utils.Map(nodes, func(node *types.Node) string { return node.Name })); err != nil {
logger.Error(ctx, err, "failed to get nodes resource info")
}
}
return perNode(c, nodes, func(node *types.Node, ch chan<- *types.Node) {
if info, ok := infos[node.Name]; ok {
Expand Down
7 changes: 7 additions & 0 deletions cluster/calcium/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ func TestListPodNodes(t *testing.T) {
}
assert.Equal(t, map[string]any{name1: 8, name2: nil}, listed)
rmgr.AssertExpectations(t)

opts.WithoutResourceInfo = true
ns, err = c.ListPodNodes(ctx, opts)
assert.NoError(t, err)
for range ns {
}
rmgr.AssertNumberOfCalls(t, "GetNodesResourceInfo", 2)
store.AssertExpectations(t)
}

Expand Down
2 changes: 1 addition & 1 deletion metrics/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func (m *Metrics) ResourceMiddleware(ctx context.Context, cluster cluster.Cluste
refreshed := scrapes.DoChan("refresh", func() (any, error) {
refreshCtx, cancel := context.WithTimeout(ctx, m.refreshTimeout)
defer cancel()
nodeCh, err := cluster.ListPodNodes(refreshCtx, &types.ListNodesOptions{All: true})
nodeCh, err := cluster.ListPodNodes(refreshCtx, &types.ListNodesOptions{All: true, WithoutResourceInfo: true})
if err != nil {
logger.Error(refreshCtx, err, "failed to list nodes")
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion metrics/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

func TestResourceMiddlewareRefreshesEveryNodeInOneCall(t *testing.T) {
cluster := &clustermocks.Cluster{}
cluster.On("ListPodNodes", mock.Anything, mock.Anything).Return(twoNodes(), nil).Once()
cluster.On("ListPodNodes", mock.Anything, mock.MatchedBy(func(opts *types.ListNodesOptions) bool { return opts.All && opts.WithoutResourceInfo })).Return(twoNodes(), nil).Once()
rmgr := &resourcemocks.Manager{}
rmgr.On("GetNodesMetrics", mock.Anything, mock.MatchedBy(func(nodes []*types.Node) bool { return len(nodes) == 2 })).Return(nil, nil).Once()

Expand Down
9 changes: 5 additions & 4 deletions types/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ type ListWorkloadsOptions struct {
}

type ListNodesOptions struct {
Podname string
Labels map[string]string
All bool
CallInfo bool
Podname string
Labels map[string]string
All bool
CallInfo bool
WithoutResourceInfo bool
}

type TriOptions int
Expand Down