From 1f27b57f535c8cb2e9dfd8e4bb247635d8fa3d45 Mon Sep 17 00:00:00 2001 From: Neil Shen Date: Wed, 25 Mar 2020 15:15:29 +0800 Subject: [PATCH] restore: populate restore cancel error (#207) Signed-off-by: Neil Shen Co-authored-by: kennytm --- pkg/restore/client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/restore/client.go b/pkg/restore/client.go index 6b88f5a6d..56bb83233 100644 --- a/pkg/restore/client.go +++ b/pkg/restore/client.go @@ -476,7 +476,7 @@ func (rc *Client) RestoreFiles( defer wg.Done() select { case <-rc.ctx.Done(): - errCh <- nil + errCh <- rc.ctx.Err() case errCh <- rc.fileImporter.Import(fileReplica, rewriteRules): updateCh.Inc() } @@ -527,7 +527,7 @@ func (rc *Client) RestoreRaw(startKey []byte, endKey []byte, files []*backup.Fil defer wg.Done() select { case <-rc.ctx.Done(): - errCh <- nil + errCh <- rc.ctx.Err() case errCh <- rc.fileImporter.Import(fileReplica, emptyRules): updateCh.Inc() }