Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tablet picker: use partial result from GetTabletMap if it is available #6639

Merged
merged 2 commits into from
Aug 31, 2020
Merged

tablet picker: use partial result from GetTabletMap if it is available #6639

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d13b28
tablet picker: use partial result from GetTabletMap if it is available.
deepthi Aug 27, 2020
2f2faf3
tablet picker: use shortCtx for all topo calls
deepthi Aug 28, 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
27 changes: 17 additions & 10 deletions go/vt/discovery/tablet_picker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,19 @@ func (tp *TabletPicker) getMatchingTablets(ctx context.Context) []*topo.TabletIn
// non-blocking read so that this is fast
shortCtx, cancel := context.WithTimeout(ctx, *topo.RemoteOperationTimeout)
defer cancel()
alias, err := tp.ts.GetCellsAlias(shortCtx, cell, false)
_, err := tp.ts.GetCellInfo(shortCtx, cell, false)
if err != nil {
// either cellAlias doesn't exist or it isn't a cell alias at all. In that case assume it is a cell
actualCells = append(actualCells, cell)
// not a valid cell, check whether it is a cell alias
shortCtx, cancel := context.WithTimeout(ctx, *topo.RemoteOperationTimeout)
defer cancel()
alias, err := tp.ts.GetCellsAlias(shortCtx, cell, false)
// if we get an error, either cellAlias doesn't exist or it isn't a cell alias at all. Ignore and continue
if err == nil {
actualCells = append(actualCells, alias.Cells...)
}
} else {
actualCells = append(actualCells, alias.Cells...)
// valid cell, add it to our list
actualCells = append(actualCells, cell)
}
}
for _, cell := range actualCells {
Expand All @@ -171,9 +178,6 @@ func (tp *TabletPicker) getMatchingTablets(ctx context.Context) []*topo.TabletIn
// match cell, keyspace and shard
sri, err := tp.ts.GetShardReplication(shortCtx, cell, tp.keyspace, tp.shard)
if err != nil {
//log.Errorf("missing shard in topo %s", debug.Stack()) //FIXME: remove after all tests run

//log.Warningf("error %v from GetShardReplication for %v %v %v", err, cell, tp.keyspace, tp.shard)
continue
}

Expand All @@ -191,14 +195,17 @@ func (tp *TabletPicker) getMatchingTablets(ctx context.Context) []*topo.TabletIn
tabletMap, err := tp.ts.GetTabletMap(shortCtx, aliases)
if err != nil {
log.Warningf("error fetching tablets from topo: %v", err)
return nil
// If we get a partial result we can still use it, otherwise return
if len(tabletMap) == 0 {
return nil
}
}
tablets := make([]*topo.TabletInfo, 0, len(aliases))
for _, tabletAlias := range aliases {
tabletInfo, ok := tabletMap[topoproto.TabletAliasString(tabletAlias)]
if !ok {
// tablet disappeared on us (GetTabletMap ignores
// topo.ErrNoNode), just echo a warning
// Either tablet disappeared on us, or we got a partial result (GetTabletMap ignores
// topo.ErrNoNode). Just log a warning
log.Warningf("failed to load tablet %v", tabletAlias)
} else if topoproto.IsTypeInList(tabletInfo.Type, tp.tabletTypes) {
tablets = append(tablets, tabletInfo)
Expand Down