restore: populate restore cancel error (#207)

Signed-off-by: Neil Shen <overvenus@gmail.com> Co-authored-by: kennytm <kennytm@gmail.com>
pingcap · Mar 25, 2020 · 1f27b57 · 1f27b57
1 parent 2f083c8
commit 1f27b57
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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()
 				}