cherry pick #25264 to release-5.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
pingcap · Jun 18, 2021 · 61d61c3 · 61d61c3
1 parent 38175b9
commit 61d61c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/telemetry/data_slow_query.go b/telemetry/data_slow_query.go
@@ -143,7 +143,7 @@ func init() {
 	currentSQBInfo["+Inf"] = 0
 
 	if mysql.TiDBReleaseVersion != "None" {
-		logutil.BgLogger().Info("Telemetry slow query stats initialized", zap.String("currentSQBInfo", currentSQBInfo.String()), zap.String("lastSQBInfo", lastSQBInfo.String()))
+		logutil.BgLogger().Debug("Telemetry slow query stats initialized", zap.String("currentSQBInfo", currentSQBInfo.String()), zap.String("lastSQBInfo", lastSQBInfo.String()))
 	}
 }
 

diff --git a/telemetry/data_window.go b/telemetry/data_window.go
@@ -18,7 +18,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/domain/infosync"
 	"github.com/pingcap/tidb/store/tikv/logutil"
 	"github.com/prometheus/client_golang/api"
@@ -110,12 +109,8 @@ func readSQLMetric(timepoint time.Time, SQLResult *sqlUsageData) error {
 	promQL := "sum(tidb_executor_statement_total{}) by (instance,type)"
 	result, err := querySQLMetric(ctx, timepoint, promQL)
 	if err != nil {
-		if err1, ok := err.(*promv1.Error); ok {
-			return errors.Errorf("query metric error, msg: %v, detail: %v", err1.Msg, err1.Detail)
-		}
-		return errors.Errorf("query metric error: %v", err.Error())
+		logutil.BgLogger().Warn("querySQLMetric got error")
 	}
-
 	anylisSQLUsage(result, SQLResult)
 	return nil
 }
@@ -155,6 +150,9 @@ func querySQLMetric(ctx context.Context, queryTime time.Time, promQL string) (re
 }
 
 func anylisSQLUsage(promResult pmodel.Value, SQLResult *sqlUsageData) {
+	if promResult == nil {
+		return
+	}
 	switch promResult.Type() {
 	case pmodel.ValVector:
 		matrix := promResult.(pmodel.Vector)