pkg

Author: hawkingrei

pkg/statistics/handle/syncload/stats_syncload.go

@@ -15,6 +15,7 @@
 package syncload
 
 import (
+	stderrors "errors"
 	"math/rand"
 	"runtime"
 	"time"
@@ -350,7 +351,7 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 	t := time.Now()
 	needUpdate := false
 	wrapper, err = s.readStatsForOneItem(sctx, item, wrapper, isPkIsHandle, task.Item.FullLoad)
-	if err != nil {
+	if err != nil || stderrors.As(err, failToGetHistMeta) {
 		return err
 	}
 	if item.IsIndex {
@@ -369,6 +370,8 @@ func (s *statsSyncLoad) handleOneItemTask(task *statstypes.NeededItemTask) (err
 	return nil
 }
 
+var failToGetHistMeta = errors.New("fail to get hist meta")
+
 // readStatsForOneItem reads hist for one column/index, TODO load data via kv-get asynchronously
 func (*statsSyncLoad) readStatsForOneItem(sctx sessionctx.Context, item model.TableItemID, w *statsWrapper, isPkIsHandle bool, fullLoad bool) (*statsWrapper, error) {
 	failpoint.Inject("mockReadStatsForOnePanic", nil)
@@ -389,7 +392,7 @@ func (*statsSyncLoad) readStatsForOneItem(sctx sessionctx.Context, item model.Ta
 		logutil.BgLogger().Error("fail to get hist meta for this histogram, possibly a deleted one", zap.Int64("table_id", item.TableID),
 			zap.Int64("hist_id", item.ID), zap.Bool("is_index", item.IsIndex))
 		// Although it is errors, we don't return err, because raise error will have to retry. it is unnecessay.
-		return nil, nil
+		return nil, failToGetHistMeta
 	}
 	if item.IsIndex {
 		isIndexFlag = 1