Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

restore: populate restore cancel error #207

Merged
merged 2 commits into from
Mar 25, 2020
Merged

restore: populate restore cancel error #207

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ede6fc3
restore: populate restore cancel error
overvenus Mar 25, 2020
b8d964a
Merge branch 'master' into populate-error
kennytm Mar 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/restore/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
}
Expand Down