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

backup,restore: fix panic when pd.GetRegion return nil (#493) #496

Merged
ti-srebot merged 3 commits into from
Sep 10, 2020
Merged

backup,restore: fix panic when pd.GetRegion return nil (#493) #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cca35f1
fix panic when pd.GetRegion return nil
glorv Sep 9, 2020
94278a0
check region not found error
glorv Sep 9, 2020
b7e4b5e
continue retry when region not found
glorv Sep 9, 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/backup/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,8 @@ func (bc *Client) findRegionLeader(
for i := 0; i < 5; i++ {
// better backoff.
region, err := bc.mgr.GetPDClient().GetRegion(ctx, key)
if err != nil {
log.Error("find leader failed", zap.Error(err))
if err != nil || region == nil {
log.Error("find leader failed", zap.Error(err), zap.Reflect("region", region))
time.Sleep(time.Millisecond * time.Duration(100*i))
continue
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/restore/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,12 @@ func (importer *FileImporter) Import(
if errIngest != nil {
break ingestRetry
}
// do not get region info, wait a second and continue
if newInfo == nil {
log.Warn("get region by key return nil", zap.Reflect("region", info.Region))
time.Sleep(time.Second)
continue
}
}
log.Debug("ingest sst returns not leader error, retry it",
utils.ZapRegion(info.Region),
Expand Down