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

xds/federation: update xdsclient to support multi authority #5042

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
229 changes: 229 additions & 0 deletions xds/internal/xdsclient/authority.go
@@ -0,0 +1,229 @@
/*
*
* Copyright 2021 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package xdsclient

import (
"errors"
"fmt"

"google.golang.org/grpc/xds/internal/xdsclient/bootstrap"
"google.golang.org/grpc/xds/internal/xdsclient/load"
"google.golang.org/grpc/xds/internal/xdsclient/pubsub"
"google.golang.org/grpc/xds/internal/xdsclient/xdsresource"
)

const federationScheme = "xdstp"

// findAuthority returns the authority for this name. If it doesn't already
// exist, one will be created.
//
// Note that this doesn't always create new authority. authorities with the same
// config but different names are shared.
//
// Caller must not hold c.authorityMu.
func (c *clientImpl) findAuthority(n *xdsresource.Name) (retA *authority, _ error) {
scheme, authority := n.Scheme, n.Authority

c.authorityMu.Lock()
defer c.authorityMu.Unlock()
if c.done.HasFired() {
return nil, errors.New("the xds-client is closed")
}
easwars marked this conversation as resolved.
Show resolved Hide resolved

defer func() {
// All returned authority from this function will be used by a watch,
// holding the ref here.
//
// Note that this must be done while c.authorityMu is held, to avoid the
// race that an authority is returned, but before the watch starts, the
// old last watch is canceled (in another goroutine), causing this
// authority to be removed, and then a watch will start on a removed
// authority.
//
// unref() will be done when the watch is canceled.
if retA != nil {
retA.ref()
}
easwars marked this conversation as resolved.
Show resolved Hide resolved
}()

var config *bootstrap.ServerConfig
if scheme != federationScheme {
config = c.config.XDSServer
} else {
authConfig, ok := c.config.Authorities[authority]
if !ok {
return nil, fmt.Errorf("xds: failed to find authority %q", authority)
}
config = authConfig.XDSServer
}
easwars marked this conversation as resolved.
Show resolved Hide resolved

a, err := c.newAuthority(config)
if err != nil {
return nil, fmt.Errorf("xds: failed to connect to the control plane for authority %q: %v", authority, err)
}
return a, nil
}

// newAuthority creates a new authority for the config. But before that, it
// checks the cache to see if an authority for this config already exists.
//
// caller must hold c.authorityMu
func (c *clientImpl) newAuthority(config *bootstrap.ServerConfig) (_ *authority, retErr error) {
// First check if there's already an authority for this config. If found, it
// means there was another watch with a different authority name but the
// same server config. Return it.
easwars marked this conversation as resolved.
Show resolved Hide resolved
configStr := config.String()
if a, ok := c.authorities[configStr]; ok {
return a, nil
}
// Second check if there's an authority in the idle cache. If found, it
// means this authority was created, but moved to the idle cache because the
// watch was canceled. Move it from idle cache to the authority cache, and
// return.
if old, ok := c.idleAuthorities.Remove(configStr); ok {
oldA, _ := old.(*authority)
if oldA != nil {
c.authorities[configStr] = oldA
return oldA, nil
}
}

// Make a new authority since there's no existing authority for this config.
ret := &authority{config: config, pubsub: pubsub.New(c.watchExpiryTimeout, c.logger)}
defer func() {
if retErr != nil {
ret.close()
}
}()
ctr, err := newController(config, ret.pubsub, c.updateValidator, c.logger)
if err != nil {
return nil, err
}
ret.controller = ctr
easwars marked this conversation as resolved.
Show resolved Hide resolved
// Add it to the cache, so it will be reused.
c.authorities[configStr] = ret
return ret, nil
}

// unrefAuthority unrefs the authority. It also moves the authority to idle
// cache if it's ref count is 0.
//
// Caller must not hold c.authorityMu.
func (c *clientImpl) unrefAuthority(a *authority) {
easwars marked this conversation as resolved.
Show resolved Hide resolved
c.authorityMu.Lock()
defer c.authorityMu.Unlock()
if a.unref() == 0 {
configStr := a.config.String()
delete(c.authorities, configStr)
c.idleAuthorities.Add(configStr, a, func() {
a.close()
})
}
easwars marked this conversation as resolved.
Show resolved Hide resolved
}

// authority is a combination of pubsub and the controller for this authority.
//
// Note that it might make sense to use one pubsub for all the resources (for
// all the controllers). One downside is the handling of StoW APIs (LDS/CDS).
// These responses contain all the resources from that control plane, so pubsub
// will need to keep lists of resources from each control plane, to know what
// are removed.
type authority struct {
config *bootstrap.ServerConfig

easwars marked this conversation as resolved.
Show resolved Hide resolved
pubsub *pubsub.Pubsub
controller controllerInterface

refCount int
}

// caller must hold parent's authorityMu.
func (a *authority) ref() {
a.refCount++
}

// caller must hold parent's authorityMu.
func (a *authority) unref() int {
a.refCount--
return a.refCount
}

func (a *authority) close() {
if a.pubsub != nil {
a.pubsub.Close()
}
if a.controller != nil {
a.controller.Close()
}
}

func (a *authority) watchListener(serviceName string, cb func(xdsresource.ListenerUpdate, error)) (cancel func()) {
first, cancelF := a.pubsub.WatchListener(serviceName, cb)
if first {
a.controller.AddWatch(xdsresource.ListenerResource, serviceName)
}
return func() {
if cancelF() {
a.controller.RemoveWatch(xdsresource.ListenerResource, serviceName)
}
}
}

func (a *authority) watchRouteConfig(routeName string, cb func(xdsresource.RouteConfigUpdate, error)) (cancel func()) {
first, cancelF := a.pubsub.WatchRouteConfig(routeName, cb)
if first {
a.controller.AddWatch(xdsresource.RouteConfigResource, routeName)
}
return func() {
if cancelF() {
a.controller.RemoveWatch(xdsresource.RouteConfigResource, routeName)
}
}
}

func (a *authority) watchCluster(clusterName string, cb func(xdsresource.ClusterUpdate, error)) (cancel func()) {
first, cancelF := a.pubsub.WatchCluster(clusterName, cb)
if first {
a.controller.AddWatch(xdsresource.ClusterResource, clusterName)
}
return func() {
if cancelF() {
a.controller.RemoveWatch(xdsresource.ClusterResource, clusterName)
}
}
}

func (a *authority) watchEndpoints(clusterName string, cb func(xdsresource.EndpointsUpdate, error)) (cancel func()) {
first, cancelF := a.pubsub.WatchEndpoints(clusterName, cb)
if first {
a.controller.AddWatch(xdsresource.EndpointsResource, clusterName)
}
return func() {
if cancelF() {
a.controller.RemoveWatch(xdsresource.EndpointsResource, clusterName)
}
}
}

func (a *authority) reportLoad(server string) (*load.Store, func()) {
return a.controller.ReportLoad(server)
}

func (a *authority) dump(t xdsresource.ResourceType) map[string]xdsresource.UpdateWithMD {
return a.pubsub.Dump(t)
}