Better metrics

.github/workflows/ci.yml

@@ -12,6 +12,11 @@ jobs:
             -   name: Git checkout
                 uses: actions/checkout@v2
 
+            -   name: Setup Golang with cache
+                uses: magnetikonline/action-golang-cache@v3
+                with:
+                    go-version-file: go.mod
+
             -   name: clone and make redis
                 run: |
                     sudo apt-get install git

internal/rdb/rdb.go

@@ -83,6 +83,13 @@ func (ld *Loader) ParseRDB() int {
 
 	// read entries
 	ld.parseRDBEntry(rd)
+
+	// force update rdb_sent_size for issue: https://github.com/alibaba/RedisShake/issues/485
+	fi, err := os.Stat(ld.filPath)
+	if err != nil {
+		log.Panicf("NewRDBReader: os.Stat error: %s", err.Error())
+	}
+	statistics.Metrics.RdbSendSize = uint64(fi.Size())
 	return ld.replStreamDbId
 }
 

internal/reader/psync.go

@@ -123,6 +123,7 @@ func (r *psyncReader) saveRDB() {
 	r.receivedOffset = int64(masterOffset)
 
 	log.Infof("source db is doing bgsave. address=[%s]", r.address)
+	statistics.Metrics.IsDoingBgsave = true
 	timeStart := time.Now()
 	// format: \n\n\n$<length>\r\n<rdb>
 	for true {
@@ -139,6 +140,7 @@ func (r *psyncReader) saveRDB() {
 		}
 		break
 	}
+	statistics.Metrics.IsDoingBgsave = false
 	log.Infof("source db bgsave finished. timeUsed=[%.2f]s, address=[%s]", time.Since(timeStart).Seconds(), r.address)
 	lengthStr, err := r.rd.ReadString('\n')
 	if err != nil {

internal/reader/rdb_reader.go

@@ -4,6 +4,8 @@ import (
 	"github.com/alibaba/RedisShake/internal/entry"
 	"github.com/alibaba/RedisShake/internal/log"
 	"github.com/alibaba/RedisShake/internal/rdb"
+	"github.com/alibaba/RedisShake/internal/statistics"
+	"os"
 	"path/filepath"
 )
 
@@ -30,6 +32,12 @@ func (r *rdbReader) StartRead() chan *entry.Entry {
 	go func() {
 		// start parse rdb
 		log.Infof("start send RDB. path=[%s]", r.path)
+		fi, err := os.Stat(r.path)
+		if err != nil {
+			log.Panicf("NewRDBReader: os.Stat error: %s", err.Error())
+		}
+		statistics.Metrics.RdbFileSize = uint64(fi.Size())
+		statistics.Metrics.RdbReceivedSize = uint64(fi.Size())
 		rdbLoader := rdb.NewLoader(r.path, r.ch)
 		_ = rdbLoader.ParseRDB()
 		log.Infof("send RDB finished. path=[%s]", r.path)

internal/statistics/statistics.go

@@ -18,6 +18,7 @@ type metrics struct {
 	DisallowEntriesCount uint64 `json:"disallow_entries_count"`
 
 	// rdb
+	IsDoingBgsave   bool   `json:"is_doing_bgsave"`
 	RdbFileSize     uint64 `json:"rdb_file_size"`
 	RdbReceivedSize uint64 `json:"rdb_received_size"`
 	RdbSendSize     uint64 `json:"rdb_send_size"`

scripts/cluster_helper/cluster_helper.py

@@ -88,7 +88,10 @@ def loop():
         for metric in sorted(metrics, key=lambda x: x["address"]):
             address = metric['address']
             if metric['rdb_file_size'] == 0:
-                print(f"{metric['address']} shaking...")
+                if metric['is_doing_bgsave']:
+                    print(f"{address} is doing bgsave...")
+                else:
+                    print(f"{metric['address']} handshaking...")
             elif metric['rdb_received_size'] < metric['rdb_file_size']:
                 print(f"{metric['address']} receiving rdb. "
                       f"percent=[{metric['rdb_received_size'] / metric['rdb_file_size'] * 100:.2f}]%, "