del log

Signed-off-by: guo-shaoge <shaoge1994@163.com>
pingcap · Sep 21, 2023 · 9d069a2 · 9d069a2
1 parent 09b47a4
commit 9d069a2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/executor/internal/calibrateresource/calibrate_resource.go b/executor/internal/calibrateresource/calibrate_resource.go
@@ -35,12 +35,10 @@ import (
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/sessiontxn/staleread"
 	"github.com/pingcap/tidb/util/chunk"
-	"github.com/pingcap/tidb/util/logutil"
 	"github.com/pingcap/tidb/util/mathutil"
 	"github.com/pingcap/tidb/util/sqlexec"
 	"github.com/tikv/client-go/v2/oracle"
 	resourceControlClient "github.com/tikv/pd/client/resource_group/controller"
-	"go.uber.org/zap"
 )
 
 var (
@@ -260,12 +258,6 @@ func (e *Executor) dynamicCalibrate(ctx context.Context, req *chunk.Chunk, exec
 	if err1 != nil && err2 != nil {
 		return err1
 	}
-	if err1 != nil {
-		logutil.BgLogger().Error("get tidb/tikv ru quota failed", zap.Error(err1))
-	}
-	if err2 != nil {
-		logutil.BgLogger().Error("get tiflash ru quota failed", zap.Error(err2))
-	}
 	req.AppendUint64(0, uint64(tidbQuota+tiflashQuota))
 	return nil
 }

diff --git a/executor/internal/calibrateresource/calibrate_resource_test.go b/executor/internal/calibrateresource/calibrate_resource_test.go
@@ -652,7 +652,6 @@ func TestCalibrateResource(t *testing.T) {
 	tk.MustQueryWithContext(ctx, "CALIBRATE RESOURCE START_TIME '2020-02-12 10:35:00' END_TIME '2020-02-12 10:45:00'").Check(testkit.Rows("5492"))
 
 	// tiflash
-	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/executor/mockTiFlashServersForCalibrateResource", "return"))
 	mockData["resource_manager_resource_unit"] = [][]types.Datum{
 		types.MakeDatums(datetime("2023-09-19 19:50:39.322000"), 465919.8102127319),
 		types.MakeDatums(datetime("2023-09-19 19:51:39.322000"), 819764.9742611333),
@@ -767,7 +766,6 @@ func TestCalibrateResource(t *testing.T) {
 		types.MakeDatums(datetime("2023-09-19 20:00:39.502000"), "127.0.0.1:8234 ", 20.0),
 	}
 	tk.MustQueryWithContext(ctx, "CALIBRATE RESOURCE START_TIME '2023-09-19 19:50:39' DURATION '10m'").Check(testkit.Rows("729439"))
-	require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/executor/mockTiFlashServersForCalibrateResource"))
 
 	delete(mockData, "process_cpu_usage")
 	tk.MustQueryWithContext(ctx, "CALIBRATE RESOURCE START_TIME '2020-02-12 10:35:00' END_TIME '2020-02-12 10:45:00'").Check(testkit.Rows("729439"))