From 6378d64c6ff817826a08eabbaea2bbd113738f32 Mon Sep 17 00:00:00 2001 From: Lynn Date: Mon, 6 Feb 2023 21:13:31 +0800 Subject: [PATCH 1/2] ddl: remove useless error log --- ddl/dist_backfilling.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ddl/dist_backfilling.go b/ddl/dist_backfilling.go index 79b1250d0e98c..53d1241444209 100644 --- a/ddl/dist_backfilling.go +++ b/ddl/dist_backfilling.go @@ -29,6 +29,7 @@ import ( "github.com/pingcap/tidb/table" "github.com/pingcap/tidb/util" "github.com/pingcap/tidb/util/dbterror" + "github.com/pingcap/tidb/util/gpool" "github.com/pingcap/tidb/util/gpool/spmc" "github.com/pingcap/tidb/util/logutil" "go.uber.org/zap" @@ -258,7 +259,7 @@ func GetTasks(d *ddlCtx, sess *session, tbl table.Table, runningJobID int64, con // TODO: add test: if all tidbs can't get the unmark backfill job(a tidb mark a backfill job, other tidbs returned, then the tidb can't handle this job.) if dbterror.ErrDDLJobNotFound.Equal(err) { logutil.BgLogger().Info("no backfill job, handle backfill task finished") - return nil, err + return nil, gpool.ErrProducerClosed } if kv.ErrWriteConflict.Equal(err) { logutil.BgLogger().Info("GetAndMarkBackfillJobsForOneEle failed", zap.Error(err)) From 819b0aa8dbc0482ae661e118dab44f0e5d3360cf Mon Sep 17 00:00:00 2001 From: Lynn Date: Mon, 6 Feb 2023 21:32:59 +0800 Subject: [PATCH 2/2] ddl: update build.bazel --- ddl/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/ddl/BUILD.bazel b/ddl/BUILD.bazel index a117b052d0651..48dfa40426b6a 100644 --- a/ddl/BUILD.bazel +++ b/ddl/BUILD.bazel @@ -110,6 +110,7 @@ go_library( "//util/filter", "//util/gcutil", "//util/generic", + "//util/gpool", "//util/gpool/spmc", "//util/hack", "//util/intest",