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.

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

ddl: limit the count of getting ddlhistory jobs (#55590) #56142

Merged
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
1 change: 1 addition & 0 deletions ddl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ go_test(
"ddl_algorithm_test.go",
"ddl_api_test.go",
"ddl_error_test.go",
"ddl_history_test.go",
"ddl_running_jobs_test.go",
"ddl_test.go",
"ddl_tiflash_test.go",
Expand Down
16 changes: 16 additions & 0 deletions ddl/ddl.go
Original file line number Diff line number Diff line change
Expand Up @@ -1728,6 +1728,9 @@ const DefNumHistoryJobs = 10

const batchNumHistoryJobs = 128

// DefNumGetDDLHistoryJobs is the max count for getting the ddl history once.
const DefNumGetDDLHistoryJobs = 2048

// GetLastNHistoryDDLJobs returns the DDL history jobs and an error.
// The maximum count of history jobs is num.
func GetLastNHistoryDDLJobs(t *meta.Meta, maxNumJobs int) ([]*model.Job, error) {
Expand Down Expand Up @@ -1888,8 +1891,21 @@ func ScanHistoryDDLJobs(m *meta.Meta, startJobID int64, limit int) ([]*model.Job
var iter meta.LastJobIterator
var err error
if startJobID == 0 {
// if 'start_job_id' == 0 and 'limit' == 0(default value), get the last 1024 ddl history job by defaultly.
if limit == 0 {
limit = DefNumGetDDLHistoryJobs

failpoint.Inject("history-ddl-jobs-limit", func(val failpoint.Value) {
injectLimit, ok := val.(int)
if ok {
logutil.BgLogger().Info("failpoint history-ddl-jobs-limit", zap.Int("limit", injectLimit))
limit = injectLimit
}
})
}
iter, err = m.GetLastHistoryDDLJobsIterator()
} else {
// if 'start_job_id' > 0, it must set value to 'limit'
if limit == 0 {
return nil, errors.New("when 'start_job_id' is specified, it must work with a 'limit'")
}
Expand Down
117 changes: 117 additions & 0 deletions ddl/ddl_history_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
// Copyright 2024 PingCAP, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package ddl_test

import (
"context"
"testing"

"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/ddl"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/meta"
"github.com/pingcap/tidb/parser/model"
"github.com/pingcap/tidb/testkit"
"github.com/stretchr/testify/require"
)

func TestDDLHistoryBasic(t *testing.T) {
var (
ddlHistoryJobCount = 0
)

store := testkit.CreateMockStore(t)
sessCtx := testNewContext(store)
ctx := kv.WithInternalSourceType(context.Background(), kv.InternalTxnDDL)
err := kv.RunInNewTxn(ctx, store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
return ddl.AddHistoryDDLJobForTest(sessCtx, t, &model.Job{
ID: 1,
}, false)
})
require.NoError(t, err)
err = kv.RunInNewTxn(ctx, store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
return ddl.AddHistoryDDLJobForTest(sessCtx, t, &model.Job{
ID: 2,
}, false)
})
require.NoError(t, err)
job, err := ddl.GetHistoryJobByID(sessCtx, 1)
require.NoError(t, err)
require.Equal(t, int64(1), job.ID)
err = kv.RunInNewTxn(ctx, store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
jobs, err := ddl.GetLastNHistoryDDLJobs(m, 2)
require.NoError(t, err)
require.Equal(t, 2, len(jobs))
return nil
})
require.NoError(t, err)

err = kv.RunInNewTxn(ctx, store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
jobs, err := ddl.GetAllHistoryDDLJobs(m)
require.NoError(t, err)
ddlHistoryJobCount = len(jobs)
return nil
})

require.NoError(t, err)
err = kv.RunInNewTxn(ctx, store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
jobs, err := ddl.ScanHistoryDDLJobs(m, 2, 2)
require.NoError(t, err)
require.Equal(t, 2, len(jobs))
require.Equal(t, int64(2), jobs[0].ID)
require.Equal(t, int64(1), jobs[1].ID)
return nil
})

require.NoError(t, err)

require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/ddl/history-ddl-jobs-limit", "return(128)"))
defer func() {
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/history-ddl-jobs-limit"))
}()

err = kv.RunInNewTxn(ctx, store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
jobs, err := ddl.ScanHistoryDDLJobs(m, 0, 0)
require.NoError(t, err)
if ddlHistoryJobCount <= 128 {
require.Equal(t, ddlHistoryJobCount, len(jobs))
} else {
require.Equal(t, 128, len(jobs))
}
require.True(t, len(jobs) > 2)
require.Equal(t, int64(2), jobs[ddlHistoryJobCount-2].ID)
require.Equal(t, int64(1), jobs[ddlHistoryJobCount-1].ID)
return nil
})

require.NoError(t, err)
}

func TestScanHistoryDDLJobsWithErrorLimit(t *testing.T) {
var (
m = &meta.Meta{}
startJobID int64 = 10
limit = 0
)

_, err := ddl.ScanHistoryDDLJobs(m, startJobID, limit)
require.ErrorContains(t, err, "when 'start_job_id' is specified, it must work with a 'limit'")
}
4 changes: 2 additions & 2 deletions docs/tidb_http_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -458,12 +458,12 @@ timezone.*

**Note**: If you request a TiDB that is not ddl owner, the response will be `This node is not a ddl owner, can't be resigned.`

1. Get all TiDB DDL job history information.
1. Get the TiDB DDL job history information.

```shell
curl http://{TiDBIP}:10080/ddl/history
```
**Note**: When the DDL history is very very long, it may consume a lot memory and even cause OOM. Consider adding `start_job_id` and `limit`.
**Note**: When the DDL history is very very long, system table may contain too many jobs. This interface will get a maximum of 2048 history ddl jobs by default. If you want get more jobs, adding `start_job_id` and `limit`.

1. Get count {number} TiDB DDL job history information.

Expand Down
2 changes: 2 additions & 0 deletions server/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ go_test(
"//util",
"//util/arena",
"//util/chunk",
"//util/cmp",
"//util/codec",
"//util/cpuprofile",
"//util/deadlockhistory",
Expand Down Expand Up @@ -217,6 +218,7 @@ go_test(
"@com_github_tikv_client_go_v2//tikvrpc",
"@io_etcd_go_etcd_tests_v3//integration",
"@io_opencensus_go//stats/view",
"@org_golang_x_exp//slices",
"@org_uber_go_atomic//:atomic",
"@org_uber_go_goleak//:goleak",
"@org_uber_go_zap//:zap",
Expand Down
17 changes: 8 additions & 9 deletions server/http_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -1284,8 +1284,11 @@

// ServeHTTP handles request of ddl jobs history.
func (h ddlHistoryJobHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
var jobID, limitID int
var err error
var (
jobID = 0
limitID = 0
err error
)
if jobValue := req.FormValue(qJobID); len(jobValue) > 0 {
jobID, err = strconv.Atoi(jobValue)
if err != nil {
Expand All @@ -1303,8 +1306,8 @@
writeError(w, err)
return
}
if limitID < 1 {
writeError(w, errors.New("ddl history limit must be greater than 0"))
if limitID < 1 || limitID > ddl.DefNumGetDDLHistoryJobs {
writeError(w, errors.Errorf("ddl history limit must be greater than 0 and less than or equal to %v", ddl.DefNumGetDDLHistoryJobs))

Check warning on line 1310 in server/http_handler.go

View check run for this annotation

Codecov / codecov/patch

server/http_handler.go#L1310

Added line #L1310 was not covered by tests
return
}
}
Expand All @@ -1324,11 +1327,7 @@
}
txnMeta := meta.NewMeta(txn)

if jobID == 0 && limit == 0 {
jobs, err = ddl.GetAllHistoryDDLJobs(txnMeta)
} else {
jobs, err = ddl.ScanHistoryDDLJobs(txnMeta, int64(jobID), limit)
}
jobs, err = ddl.ScanHistoryDDLJobs(txnMeta, int64(jobID), limit)
if err != nil {
return nil, errors.Trace(err)
}
Expand Down
7 changes: 7 additions & 0 deletions server/http_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ import (
"github.com/pingcap/tidb/testkit"
"github.com/pingcap/tidb/testkit/external"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/cmp"
"github.com/pingcap/tidb/util/codec"
"github.com/pingcap/tidb/util/deadlockhistory"
"github.com/pingcap/tidb/util/rowcodec"
"github.com/stretchr/testify/require"
"github.com/tikv/client-go/v2/tikv"
"go.etcd.io/etcd/tests/v3/integration"
"go.uber.org/zap"
"golang.org/x/exp/slices"
)

type basicHTTPHandlerTestSuite struct {
Expand Down Expand Up @@ -989,6 +991,11 @@ func TestAllHistory(t *testing.T) {
data, err := ddl.GetAllHistoryDDLJobs(txnMeta)
require.NoError(t, err)
err = decoder.Decode(&jobs)
require.True(t, len(jobs) < ddl.DefNumGetDDLHistoryJobs)
// sort job.
slices.SortFunc(jobs, func(i, j *model.Job) int {
return cmp.Compare(i.ID, j.ID)
})

require.NoError(t, err)
require.NoError(t, resp.Body.Close())
Expand Down