From 32f6ca1551d4bead8d7ee420a7aa19dbd3293cf8 Mon Sep 17 00:00:00 2001 From: dongjianhui03 Date: Fri, 15 Oct 2021 18:57:06 +0800 Subject: [PATCH] remove some error which is useless --- cluster/router/v3router/router_chain.go | 8 ++------ cluster/router/v3router/uniform_route.go | 10 +++------- cluster/router/v3router/uniform_rule.go | 4 ++-- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/cluster/router/v3router/router_chain.go b/cluster/router/v3router/router_chain.go index 77fc50c433..160c65937b 100644 --- a/cluster/router/v3router/router_chain.go +++ b/cluster/router/v3router/router_chain.go @@ -219,6 +219,7 @@ func parseFromConfigToRouters(virtualServiceConfig, destinationRuleConfig []byte routers := make([]*UniformRouter, 0) + // 3. construct virtual service host to destination mapping for _, v := range virtualServiceConfigList { tempServiceNeedsDescMap := make(map[string]map[string]string) for _, host := range v.Spec.Hosts { @@ -229,12 +230,7 @@ func parseFromConfigToRouters(virtualServiceConfig, destinationRuleConfig []byte mapCopy(tempServiceNeedsDescMap, targetDestMap) } // transform single config to one rule - rtr, err := NewUniformRouter(v.Spec.Dubbo, tempServiceNeedsDescMap) - if err != nil { - logger.Error("new uniform router err = ", err) - return nil, err - } - routers = append(routers, rtr) + routers = append(routers, NewUniformRouter(v.Spec.Dubbo, tempServiceNeedsDescMap)) } logger.Debug("parsed successfully with router size = ", len(routers)) return routers, nil diff --git a/cluster/router/v3router/uniform_route.go b/cluster/router/v3router/uniform_route.go index f2e4273a9f..8d42ceefa3 100644 --- a/cluster/router/v3router/uniform_route.go +++ b/cluster/router/v3router/uniform_route.go @@ -34,19 +34,15 @@ type UniformRouter struct { } // NewUniformRouter construct an NewConnCheckRouter via url -func NewUniformRouter(dubboRoutes []*config.DubboRoute, destinationMap map[string]map[string]string) (*UniformRouter, error) { +func NewUniformRouter(dubboRoutes []*config.DubboRoute, destinationMap map[string]map[string]string) *UniformRouter { uniformRules := make([]*UniformRule, 0) for _, v := range dubboRoutes { - uniformRule, err := newUniformRule(v, destinationMap) - if err != nil { - return nil, err - } - uniformRules = append(uniformRules, uniformRule) + uniformRules = append(uniformRules, newUniformRule(v, destinationMap)) } return &UniformRouter{ uniformRules: uniformRules, - }, nil + } } // Route gets a list of routed invoker diff --git a/cluster/router/v3router/uniform_rule.go b/cluster/router/v3router/uniform_rule.go index c1c9da25b7..3ea38194d8 100644 --- a/cluster/router/v3router/uniform_rule.go +++ b/cluster/router/v3router/uniform_rule.go @@ -206,7 +206,7 @@ type UniformRule struct { } // NewDefaultConnChecker constructs a new DefaultConnChecker based on the url -func newUniformRule(dubboRoute *config.DubboRoute, destinationMap map[string]map[string]string) (*UniformRule, error) { +func newUniformRule(dubboRoute *config.DubboRoute, destinationMap map[string]map[string]string) *UniformRule { matchItems := dubboRoute.RouterDetail virtualServiceRules := make([]VirtualServiceRule, 0) newUniformRule := &UniformRule{ @@ -220,7 +220,7 @@ func newUniformRule(dubboRoute *config.DubboRoute, destinationMap map[string]map }) } newUniformRule.virtualServiceRules = virtualServiceRules - return newUniformRule, nil + return newUniformRule } func (u *UniformRule) route(invokers []protocol.Invoker, url *common.URL, invocation protocol.Invocation) []protocol.Invoker {