log-backup: adapt the new metrics (pingcap#36479) (pingcap#36510)

ref pingcap#36092
ti-srebot · Jul 26, 2022 · c6cd9dd · c6cd9dd
1 parent 4e869f1
commit c6cd9dd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/br/pkg/stream/stream_status.go b/br/pkg/stream/stream_status.go
@@ -247,7 +247,7 @@ func (p *printByJSON) PrintTasks() {
 	p.console.Println(mustMarshal(tasks))
 }
 
-var logCountSumRe = regexp.MustCompile(`tikv_stream_handle_kv_batch_sum ([0-9]+)`)
+var logCountSumRe = regexp.MustCompile(`tikv_(?:stream|log_backup)_handle_kv_batch_sum ([0-9]+)`)
 
 type PDInfoProvider interface {
 	GetPDClient() pd.Client
@@ -279,10 +279,10 @@ func MaybeQPS(ctx context.Context, mgr PDInfoProvider) (float64, error) {
 			return 0, err
 		}
 		matches := logCountSumRe.FindSubmatch(data)
+		log.Info("get qps", zap.ByteStrings("matches", matches), logutil.Redact(zap.String("addr", statusAddr)))
 		if len(matches) < 2 {
 			return 42, nil
 		}
-		log.Info("get qps", zap.ByteStrings("matches", matches), logutil.Redact(zap.String("addr", statusAddr)))
 		return strconv.ParseUint(string(matches[1]), 10, 64)
 	}
 	qpsMap := new(sync.Map)
@@ -303,7 +303,7 @@ func MaybeQPS(ctx context.Context, mgr PDInfoProvider) (float64, error) {
 			return errors.Annotatef(err, "failed to get count from %s", statusAddr)
 		}
 		elapsed := float64(time.Since(start)) / float64(time.Second)
-		log.Info("calc qps", zap.Uint64("diff", c1-c0), zap.Float64("elapsed", elapsed))
+		log.Info("calc qps", zap.Uint64("diff", c1-c0), zap.Float64("elapsed", elapsed), zap.Uint64("c0", c0), zap.Uint64("c1", c1))
 
 		qpsMap.Store(s.GetId(), float64(c1-c0)/elapsed)
 		return nil