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

service config: default service config #2686

Merged
merged 5 commits into from
Apr 3, 2019
Merged

service config: default service config #2686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd4f1b6
service config: default service config
lyuxuan Mar 8, 2019
90b260d
fix reviews again
lyuxuan Mar 25, 2019
ec65214
fix fix fix
lyuxuan Mar 26, 2019
6102f9d
fff
lyuxuan Mar 30, 2019
54503a7
remove pointer
lyuxuan Apr 3, 2019
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
34 changes: 25 additions & 9 deletions clientconn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,9 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *
select {
case sc, ok := <-cc.dopts.scChan:
if ok {
cc.sc = sc
cc.sc = &sc
s := "" // for service config API v1, we don't care the raw json string.
cc.sc.rawJSONString = &s
scSet = true
}
default:
Expand Down Expand Up @@ -270,7 +272,9 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *
select {
case sc, ok := <-cc.dopts.scChan:
if ok {
cc.sc = sc
cc.sc = &sc
s := "" // for service config API v1, we don't care the raw json string.
cc.sc.rawJSONString = &s
}
case <-ctx.Done():
return nil, ctx.Err()
Expand Down Expand Up @@ -392,7 +396,7 @@ type ClientConn struct {

mu sync.RWMutex
resolverWrapper *ccResolverWrapper
sc ServiceConfig
sc *ServiceConfig
conns map[*addrConn]struct{}
// Keepalive parameter can be updated if a GoAway is received.
mkp keepalive.ClientParameters
Expand Down Expand Up @@ -438,8 +442,8 @@ func (cc *ClientConn) scWatcher() {
cc.mu.Lock()
// TODO: load balance policy runtime change is ignored.
// We may revisit this decision in the future.
cc.sc = sc
s := ""
cc.sc = &sc
s := "" // for service config API v1, we don't care the raw json string.
cc.sc.rawJSONString = &s
cc.mu.Unlock()
case <-cc.ctx.Done():
Expand Down Expand Up @@ -496,7 +500,7 @@ func (cc *ClientConn) updateResolverState(s resolver.State) error {
}

if cc.fallbackToDefaultServiceConfig(s.ServiceConfig) {
if cc.dopts.defaultServiceConfig != nil && cc.sc.rawJSONString == nil {
if cc.dopts.defaultServiceConfig != nil && cc.sc == nil {
cc.applyServiceConfig(cc.dopts.defaultServiceConfig)
}
} else {
Expand All @@ -505,11 +509,17 @@ func (cc *ClientConn) updateResolverState(s resolver.State) error {
if err != nil {
return err
}
if cc.sc.rawJSONString == nil || *cc.sc.rawJSONString != s.ServiceConfig {
if cc.sc == nil || *cc.sc.rawJSONString != s.ServiceConfig {
cc.applyServiceConfig(sc)
}
}

// update the service config that will be sent to balancer.
if cc.sc != nil {
fmt.Println(cc.sc)
s.ServiceConfig = *cc.sc.rawJSONString
}

if cc.dopts.balancerBuilder == nil {
// Only look at balancer types and switch balancer if balancer dial
// option is not set.
Expand All @@ -524,7 +534,7 @@ func (cc *ClientConn) updateResolverState(s resolver.State) error {
// TODO: use new loadBalancerConfig field with appropriate priority.
if isGRPCLB {
newBalancerName = grpclbName
} else if cc.sc.LB != nil {
} else if cc.sc != nil && cc.sc.LB != nil {
newBalancerName = *cc.sc.LB
} else {
newBalancerName = PickFirstBalancerName
Expand Down Expand Up @@ -744,6 +754,9 @@ func (cc *ClientConn) GetMethodConfig(method string) MethodConfig {
// TODO: Avoid the locking here.
cc.mu.RLock()
defer cc.mu.RUnlock()
if cc.sc == nil {
return MethodConfig{}
}
m, ok := cc.sc.Methods[method]
if !ok {
i := strings.LastIndex(method, "/")
Expand All @@ -755,6 +768,9 @@ func (cc *ClientConn) GetMethodConfig(method string) MethodConfig {
func (cc *ClientConn) healthCheckConfig() *healthCheckConfig {
cc.mu.RLock()
defer cc.mu.RUnlock()
if cc.sc == nil {
return nil
}
return cc.sc.healthCheckConfig
}

Expand All @@ -773,7 +789,7 @@ func (cc *ClientConn) applyServiceConfig(sc *ServiceConfig) error {
// should never reach here.
return fmt.Errorf("got nil pointer for service config")
}
cc.sc = *sc
cc.sc = sc

if cc.sc.retryThrottling != nil {
newThrottler := &retryThrottler{
Expand Down
2 changes: 1 addition & 1 deletion dialoptions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ type dialOptions struct {
disableHealthCheck bool
healthCheckFunc internal.HealthChecker
minConnectTimeout func() time.Duration
defaultServiceConfig *ServiceConfig
defaultServiceConfig *ServiceConfig // defaultServiceConfig is parsed from defaultServiceConfigRawJSON.
defaultServiceConfigRawJSON *string
}

Expand Down