From efec5c3625ec684d00dce54ad081844ff4e98a0c Mon Sep 17 00:00:00 2001 From: tiancaiamao Date: Tue, 14 Sep 2021 14:36:40 +0800 Subject: [PATCH] ddl: add some debug log for unstable test TestTruncatePartitionAndDropTable (#28014) --- ddl/db_partition_test.go | 6 +++++- ddl/delete_range.go | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ddl/db_partition_test.go b/ddl/db_partition_test.go index cd8270bfe20f6..5964fb2185d1f 100644 --- a/ddl/db_partition_test.go +++ b/ddl/db_partition_test.go @@ -48,8 +48,10 @@ import ( "github.com/pingcap/tidb/util/admin" "github.com/pingcap/tidb/util/collate" "github.com/pingcap/tidb/util/israce" + "github.com/pingcap/tidb/util/logutil" "github.com/pingcap/tidb/util/mock" "github.com/pingcap/tidb/util/testkit" + "go.uber.org/zap" ) func (s *testIntegrationSuite3) TestCreateTableWithPartition(c *C) { @@ -2231,10 +2233,12 @@ func (s *testIntegrationSuite4) TestTruncatePartitionAndDropTable(c *C) { c.Assert(err, IsNil) // Only one partition id test is taken here. oldPID := oldTblInfo.Meta().Partition.Definitions[0].ID + startTime := time.Now() tk.MustExec("truncate table t3;") partitionPrefix := tablecodec.EncodeTablePrefix(oldPID) + logutil.BgLogger().Info("truncate partition table", zap.Stringer("key", partitionPrefix)) hasOldPartitionData := checkPartitionDelRangeDone(c, s.testIntegrationSuite, partitionPrefix) - c.Assert(hasOldPartitionData, IsFalse) + c.Assert(hasOldPartitionData, IsFalse, Commentf("take time %v", time.Since(startTime))) // Test drop table partition. tk.MustExec("drop table if exists t4;") diff --git a/ddl/delete_range.go b/ddl/delete_range.go index 6430a8f2a3219..b4aafff185146 100644 --- a/ddl/delete_range.go +++ b/ddl/delete_range.go @@ -234,7 +234,12 @@ func (dr *delRange) doTask(ctx sessionctx.Context, r util.DelRangeTask) error { logutil.BgLogger().Error("[ddl] delRange emulator complete task failed", zap.Error(err)) return errors.Trace(err) } - logutil.BgLogger().Info("[ddl] delRange emulator complete task", zap.Int64("jobID", r.JobID), zap.Int64("elementID", r.ElementID)) + startKey, endKey := r.Range() + logutil.BgLogger().Info("[ddl] delRange emulator complete task", + zap.Int64("jobID", r.JobID), + zap.Int64("elementID", r.ElementID), + zap.Stringer("startKey", startKey), + zap.Stringer("endKey", endKey)) break } if err := util.UpdateDeleteRange(ctx, r, newStartKey, oldStartKey); err != nil {