Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

server: return authoritative span statistics for db details endpoint #108037

Merged
merged 1 commit into from Aug 14, 2023
Merged

server: return authoritative span statistics for db details endpoint #108037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/ccl/serverccl/admin_test.go
View file
Open in desktop
Expand Up @@ -225,6 +225,12 @@ func TestTableAndDatabaseDetailsAndStats(t *testing.T) {

require.Equal(t, dbResp.TableNames[0], "public.test")

var dbDetailsResp serverpb.DatabaseDetailsResponse
err = getAdminJSONProto(st, "databases/defaultdb?include_stats=true", &dbDetailsResp)
require.NoError(t, err)

require.Greater(t, dbDetailsResp.Stats.RangeCount, int64(0))

// TableStats
tableStatsResp := &serverpb.TableStatsResponse{}
err = getAdminJSONProto(st, "databases/defaultdb/tables/public.test/stats", tableStatsResp)
Expand Down
38 changes: 18 additions & 20 deletions pkg/server/admin.go
View file
Open in desktop
Expand Up @@ -67,6 +67,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/util/mon"
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
"github.com/cockroachdb/cockroach/pkg/util/quotapool"
"github.com/cockroachdb/cockroach/pkg/util/rangedesc"
"github.com/cockroachdb/cockroach/pkg/util/safesql"
"github.com/cockroachdb/cockroach/pkg/util/stop"
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
Expand Down Expand Up @@ -1328,16 +1329,9 @@ func (s *adminServer) statsForSpan(
ctx, cancel := context.WithCancel(ctx)
defer cancel()

rSpan, err := keys.SpanAddr(span)
if err != nil {
return nil, err
}

// Get a list of nodeIDs, range counts, and replica counts per node
// for the specified span.
nodeIDs, rangeCount, replCounts, err := getNodeIDsRangeCountReplCountForSpan(
ctx, s.distSender, rSpan,
)
nodeIDs, rangeCount, replCounts, err := s.getSpanDetails(ctx, span)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1450,25 +1444,29 @@ func (s *adminServer) statsForSpan(

// Returns the list of node ids, range count,
// and replica count for the specified span.
func getNodeIDsRangeCountReplCountForSpan(
ctx context.Context, ds *kvcoord.DistSender, rSpan roachpb.RSpan,
func (s *adminServer) getSpanDetails(
ctx context.Context, span roachpb.Span,
) (nodeIDList []roachpb.NodeID, rangeCount int64, replCounts map[roachpb.NodeID]int64, _ error) {
nodeIDs := make(map[roachpb.NodeID]struct{})
replCountForNodeID := make(map[roachpb.NodeID]int64)
ri := kvcoord.MakeRangeIterator(ds)
ri.Seek(ctx, rSpan.Key, kvcoord.Ascending)
for ; ri.Valid(); ri.Next(ctx) {
var it rangedesc.Iterator
var err error
if s.sqlServer.tenantConnect == nil {
it, err = s.sqlServer.execCfg.RangeDescIteratorFactory.NewIterator(ctx, span)
} else {
it, err = s.sqlServer.tenantConnect.NewIterator(ctx, span)
}
if err != nil {
return nil, 0, nil, err
}
var rangeDesc roachpb.RangeDescriptor
for ; it.Valid(); it.Next() {
rangeCount++
for _, repl := range ri.Desc().Replicas().Descriptors() {
rangeDesc = it.CurRangeDescriptor()
for _, repl := range rangeDesc.Replicas().Descriptors() {
replCountForNodeID[repl.NodeID]++
nodeIDs[repl.NodeID] = struct{}{}
}
if !ri.NeedAnother(rSpan) {
break
}
}
if err := ri.Error(); err != nil {
return nil, 0, nil, err
}

nodeIDList = make([]roachpb.NodeID, 0, len(nodeIDs))
Expand Down