From 1cc914cf08931e843092e2d585bbe2d4c47c9d53 Mon Sep 17 00:00:00 2001 From: Hillium Date: Wed, 8 Jul 2020 13:12:00 +0800 Subject: [PATCH 1/3] backup: make sure backup time greater than 0 --- pkg/backup/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/backup/client.go b/pkg/backup/client.go index 44e982b21..6c732c501 100644 --- a/pkg/backup/client.go +++ b/pkg/backup/client.go @@ -409,7 +409,7 @@ func (bc *Client) BackupRanges( for files := range filesCh { cur, start = start, time.Now() allFiles = append(allFiles, files...) - summary.CollectSuccessUnit("backup ranges", 1, cur.Sub(start)) + summary.CollectSuccessUnit("backup ranges", 1, start.Sub(cur)) } log.Info("Backup Ranges", zap.Duration("take", cur.Sub(init))) }() From 9e365a365453c2afa920507028b848098506b245 Mon Sep 17 00:00:00 2001 From: Hillium Date: Wed, 8 Jul 2020 13:25:54 +0800 Subject: [PATCH 2/3] backup: rename some variables --- pkg/backup/client.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/backup/client.go b/pkg/backup/client.go index 6c732c501..1a8081c5c 100644 --- a/pkg/backup/client.go +++ b/pkg/backup/client.go @@ -405,13 +405,13 @@ func (bc *Client) BackupRanges( allFiles := make([]*kvproto.File, 0, len(ranges)) go func() { init := time.Now() - start, cur := init, init + currentBackupStart, lastBackupStart := init, init for files := range filesCh { - cur, start = start, time.Now() + lastBackupStart, currentBackupStart = currentBackupStart, time.Now() allFiles = append(allFiles, files...) - summary.CollectSuccessUnit("backup ranges", 1, start.Sub(cur)) + summary.CollectSuccessUnit("backup ranges", 1, currentBackupStart.Sub(lastBackupStart)) } - log.Info("Backup Ranges", zap.Duration("take", cur.Sub(init))) + log.Info("Backup Ranges", zap.Duration("take", currentBackupStart.Sub(init))) }() go func() { From c8a2f0f761e332943f40847e7679728a035d40ed Mon Sep 17 00:00:00 2001 From: Hillium Date: Wed, 8 Jul 2020 13:39:41 +0800 Subject: [PATCH 3/3] backup: make CI happy --- pkg/backup/client.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/backup/client.go b/pkg/backup/client.go index 1a8081c5c..0d1d2ef2a 100644 --- a/pkg/backup/client.go +++ b/pkg/backup/client.go @@ -405,12 +405,13 @@ func (bc *Client) BackupRanges( allFiles := make([]*kvproto.File, 0, len(ranges)) go func() { init := time.Now() - currentBackupStart, lastBackupStart := init, init + lastBackupStart, currentBackupStart := init, init for files := range filesCh { lastBackupStart, currentBackupStart = currentBackupStart, time.Now() allFiles = append(allFiles, files...) summary.CollectSuccessUnit("backup ranges", 1, currentBackupStart.Sub(lastBackupStart)) } + _ = lastBackupStart log.Info("Backup Ranges", zap.Duration("take", currentBackupStart.Sub(init))) }()