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

telemetry: resource control telemetry #40687

Merged
merged 7 commits into from
Jan 18, 2023
Merged

telemetry: resource control telemetry #40687

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
039c11a
*: add telmetry support for resource control
BornChanger Jan 18, 2023
83be3f0
*: fix typo
BornChanger Jan 18, 2023
5847cc1
*: fix information_schema copy bug
BornChanger Jan 18, 2023
8195d50
*: adjust case
BornChanger Jan 18, 2023
cf5fa6e
Merge branch 'master' into resource_control_telemetry
ti-chi-bot Jan 18, 2023
bb0021d
Merge branch 'master' into resource_control_telemetry
ti-chi-bot Jan 18, 2023
4f6dc97
Merge branch 'master' into resource_control_telemetry
ti-chi-bot Jan 18, 2023
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: 14 additions & 2 deletions telemetry/data_feature_usage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ type featureUsage struct {
EnableGlobalMemoryControl bool `json:"enableGlobalMemoryControl"`
AutoIDNoCache bool `json:"autoIDNoCache"`
IndexMergeUsageCounter *m.IndexMergeUsageCounter `json:"indexMergeUsageCounter"`
ResourceControlUsage *resourceControlUsage `json:"resourceControl"`
}

type placementPolicyUsage struct {
Expand All @@ -69,6 +70,11 @@ type placementPolicyUsage struct {
NumPartitionWithExplicitPolicies uint64 `json:"numPartitionWithExplicitPolicies"`
}

type resourceControlUsage struct {
Enabled bool `json:"resourceControlEnabled"`
NumResourceGroups uint64 `json:"numResourceGroups"`
}

func getFeatureUsage(ctx context.Context, sctx sessionctx.Context) (*featureUsage, error) {
var usage featureUsage
var err error
Expand Down Expand Up @@ -114,11 +120,12 @@ func getFeatureUsage(ctx context.Context, sctx sessionctx.Context) (*featureUsag
return &usage, nil
}

// collectFeatureUsageFromInfoschema updates the usage for temporary table, cached table and placement policies.
// collectFeatureUsageFromInfoschema updates the usage for temporary table, cached table, placement policies and resource groups.
func collectFeatureUsageFromInfoschema(ctx sessionctx.Context, usage *featureUsage) {
if usage.PlacementPolicyUsage == nil {
usage.PlacementPolicyUsage = &placementPolicyUsage{}
}

is := GetDomainInfoSchema(ctx)
for _, dbInfo := range is.AllSchemas() {
if dbInfo.PlacementPolicyRef != nil {
Expand Down Expand Up @@ -149,8 +156,13 @@ func collectFeatureUsageFromInfoschema(ctx sessionctx.Context, usage *featureUsa
}
}
}

usage.PlacementPolicyUsage.NumPlacementPolicies += uint64(len(is.AllPlacementPolicies()))

if usage.ResourceControlUsage == nil {
usage.ResourceControlUsage = &resourceControlUsage{}
}
usage.ResourceControlUsage.NumResourceGroups = uint64(len(is.AllResourceGroups()))
usage.ResourceControlUsage.Enabled = variable.EnableResourceControl.Load()
}

// GetDomainInfoSchema is used by the telemetry package to get the latest schema information
Expand Down
39 changes: 39 additions & 0 deletions telemetry/data_feature_usage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,45 @@ func TestPlacementPolicies(t *testing.T) {
require.Equal(t, uint64(1), usage.PlacementPolicyUsage.NumPartitionWithExplicitPolicies)
}

func TestResourceGroups(t *testing.T) {
store := testkit.CreateMockStore(t)

tk := testkit.NewTestKit(t, store)

usage, err := telemetry.GetFeatureUsage(tk.Session())
require.NoError(t, err)
require.Equal(t, uint64(0), usage.ResourceControlUsage.NumResourceGroups)
require.Equal(t, false, usage.ResourceControlUsage.Enabled)

tk.MustExec("set global tidb_enable_resource_control = 'ON'")
tk.MustExec("create resource group x rru_per_sec=100 wru_per_sec=200")
usage, err = telemetry.GetFeatureUsage(tk.Session())
require.NoError(t, err)
require.Equal(t, true, usage.ResourceControlUsage.Enabled)
require.Equal(t, uint64(1), usage.ResourceControlUsage.NumResourceGroups)

tk.MustExec("create resource group y rru_per_sec=100 wru_per_sec=200")
usage, err = telemetry.GetFeatureUsage(tk.Session())
require.NoError(t, err)
require.Equal(t, uint64(2), usage.ResourceControlUsage.NumResourceGroups)

tk.MustExec("alter resource group y rru_per_sec=100 wru_per_sec=300")
usage, err = telemetry.GetFeatureUsage(tk.Session())
require.NoError(t, err)
require.Equal(t, uint64(2), usage.ResourceControlUsage.NumResourceGroups)

tk.MustExec("drop resource group y")
usage, err = telemetry.GetFeatureUsage(tk.Session())
require.NoError(t, err)
require.Equal(t, uint64(1), usage.ResourceControlUsage.NumResourceGroups)

tk.MustExec("set global tidb_enable_resource_control = 'OFF'")
usage, err = telemetry.GetFeatureUsage(tk.Session())
require.NoError(t, err)
require.Equal(t, uint64(1), usage.ResourceControlUsage.NumResourceGroups)
require.Equal(t, false, usage.ResourceControlUsage.Enabled)
}

func TestAutoCapture(t *testing.T) {
store := testkit.CreateMockStore(t)

Expand Down