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

ts: update server queries to account for system tenant id #109727

Merged
merged 1 commit into from
Aug 31, 2023
Merged

ts: update server queries to account for system tenant id #109727

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions pkg/ts/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,10 +845,14 @@ func (db *DB) readFromDatabase(
kd := diskResolution.SlabDuration()
for currentTimestamp := startTimestamp; currentTimestamp <= timespan.EndNanos; currentTimestamp += kd {
for _, source := range sources {
// If a TenantID is specified and is not the system tenant, only query
// data for that tenant source.
if tenantID.IsSet() && !tenantID.IsSystem() {
source = tsutil.MakeTenantSource(source, tenantID.String())
// If a TenantID is specified we may need to format the source in order to retrieve the correct data.
// e.g. if not system tenant we need the source to be of format nodeID-tenantID but if it is the
// system tenant we need the source to be of format nodeID. Otherwise we get all the data via the
// format nodeID-
if tenantID.IsSet() {
if !tenantID.IsSystem() {
source = tsutil.MakeTenantSource(source, tenantID.String())
}
key := MakeDataKey(seriesName, source, diskResolution, currentTimestamp)
b.Get(key)
} else {
Expand Down Expand Up @@ -905,7 +909,7 @@ func (db *DB) readAllSourcesFromDatabase(
return nil, err
}

if !tenantID.IsSet() || tenantID.IsSystem() {
if !tenantID.IsSet() {
return b.Results[0].Rows, nil
}

Expand All @@ -917,7 +921,7 @@ func (db *DB) readAllSourcesFromDatabase(
return nil, err
}
_, tenantSource := tsutil.DecodeSource(source)
if tenantSource == tenantID.String() {
if tenantID.IsSystem() && tenantSource == "" || tenantSource == tenantID.String() {
rows = append(rows, row)
}
}
Expand Down
72 changes: 69 additions & 3 deletions pkg/ts/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ func TestServerQueryTenant(t *testing.T) {
t.Fatal(err)
}

// System tenant should aggregate across all tenants.
expectedSystemResult := &tspb.TimeSeriesQueryResponse{
// Undefined tenant ID should aggregate across all tenants.
expectedAggregatedResult := &tspb.TimeSeriesQueryResponse{
Results: []tspb.TimeSeriesQueryResponse_Result{
{
Query: tspb.Query{
Expand Down Expand Up @@ -408,7 +408,7 @@ func TestServerQueryTenant(t *testing.T) {

conn := s.RPCClientConn(t, username.RootUserName())
client := tspb.NewTimeSeriesClient(conn)
systemResponse, err := client.Query(context.Background(), &tspb.TimeSeriesQueryRequest{
aggregatedResponse, err := client.Query(context.Background(), &tspb.TimeSeriesQueryRequest{
StartNanos: 400 * 1e9,
EndNanos: 500 * 1e9,
Queries: []tspb.Query{
Expand All @@ -417,13 +417,78 @@ func TestServerQueryTenant(t *testing.T) {
Sources: []string{"1"},
},
{
// Not providing a source (nodeID or storeID) will aggregate across all sources.
Name: "test.metric",
},
},
})
if err != nil {
t.Fatal(err)
}
for _, r := range aggregatedResponse.Results {
sort.Strings(r.Sources)
}
require.Equal(t, expectedAggregatedResult, aggregatedResponse)

// System tenant ID should provide system tenant ts data.
systemID := roachpb.MustMakeTenantID(1)
expectedSystemResult := &tspb.TimeSeriesQueryResponse{
Results: []tspb.TimeSeriesQueryResponse_Result{
{
Query: tspb.Query{
Name: "test.metric",
Sources: []string{"1"},
TenantID: systemID,
},
Datapoints: []tspb.TimeSeriesDatapoint{
{
TimestampNanos: 400 * 1e9,
Value: 100.0,
},
{
TimestampNanos: 500 * 1e9,
Value: 200.0,
},
},
},
{
Query: tspb.Query{
Name: "test.metric",
Sources: []string{"1", "10"},
TenantID: systemID,
},
Datapoints: []tspb.TimeSeriesDatapoint{
{
TimestampNanos: 400 * 1e9,
Value: 300.0,
},
{
TimestampNanos: 500 * 1e9,
Value: 600.0,
},
},
},
},
}

systemResponse, err := client.Query(context.Background(), &tspb.TimeSeriesQueryRequest{
StartNanos: 400 * 1e9,
EndNanos: 500 * 1e9,
Queries: []tspb.Query{
{
Name: "test.metric",
Sources: []string{"1"},
TenantID: systemID,
},
{
Name: "test.metric",
TenantID: systemID,
},
},
})
if err != nil {
t.Fatal(err)
}
for _, r := range systemResponse.Results {
sort.Strings(r.Sources)
}
Expand Down Expand Up @@ -489,6 +554,7 @@ func TestServerQueryTenant(t *testing.T) {
Sources: []string{"1"},
},
{
// Not providing a source (nodeID or storeID) will aggregate across all sources.
Name: "test.metric",
},
},
Expand Down