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.

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

sql: use kv_node_status to determine node liveness for multiregion #60305

Merged
merged 1 commit into from
Feb 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/sql/alter_database.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (n *alterDatabaseAddRegionNode) startExec(params runParams) error {
// Add the region to the database descriptor. This function validates that the region
// we're adding is an active member of the cluster and isn't already present in the
// RegionConfig.
if err := params.p.addRegionToRegionConfig(n.desc, n.n); err != nil {
if err := params.p.addRegionToRegionConfig(params.ctx, n.desc, n.n); err != nil {
return err
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/sql/descriptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,9 @@ func validateDatabaseRegionConfig(regionConfig descpb.DatabaseDescriptor_RegionC
// addRegionToRegionConfig adds the supplied region to the RegionConfig in the
// supplied database descriptor.
func (p *planner) addRegionToRegionConfig(
desc *dbdesc.Mutable, regionToAdd *tree.AlterDatabaseAddRegion,
ctx context.Context, desc *dbdesc.Mutable, regionToAdd *tree.AlterDatabaseAddRegion,
) error {
liveRegions, err := p.getLiveClusterRegions()
liveRegions, err := p.getLiveClusterRegions(ctx)
if err != nil {
return err
}
Expand Down Expand Up @@ -320,7 +320,7 @@ func (p *planner) createRegionConfig(
if err != nil {
return nil, err
}
liveRegions, err := p.getLiveClusterRegions()
liveRegions, err := p.getLiveClusterRegions(ctx)
if err != nil {
return nil, err
}
Expand Down
24 changes: 14 additions & 10 deletions pkg/sql/region_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,23 @@ func (s *liveClusterRegions) toStrings() []string {
// getLiveClusterRegions returns a set of live region names in the cluster.
// A region name is deemed active if there is at least one alive node
// in the cluster in with locality set to a given region.
func (p *planner) getLiveClusterRegions() (liveClusterRegions, error) {
nodes, err := getAllNodeDescriptors(p)
func (p *planner) getLiveClusterRegions(ctx context.Context) (liveClusterRegions, error) {
rows, err := p.ExtendedEvalContext().ExecCfg.InternalExecutor.QueryEx(
ctx,
"get_live_cluster_regions",
p.txn,
sessiondata.InternalExecutorOverride{
User: p.SessionData().User(),
},
"SELECT region FROM [SHOW REGIONS FROM CLUSTER]",
)
if err != nil {
return nil, err
}
var ret liveClusterRegions = make(map[descpb.RegionName]struct{})
for _, node := range nodes {
for _, tier := range node.Locality.Tiers {
if tier.Key == "region" {
ret[descpb.RegionName(tier.Value)] = struct{}{}
break
}
}

var ret liveClusterRegions = make(map[descpb.RegionName]struct{}, len(rows))
for _, row := range rows {
ret[descpb.RegionName(*row[0].(*tree.DString))] = struct{}{}
}
return ret, nil
}
Expand Down