From ee8ff8d88626ee813ba9934657c125b29720075e Mon Sep 17 00:00:00 2001
From: Joe Zou <yixian.zou@gmail.com>
Date: Mon, 6 Jan 2020 14:50:39 +0800
Subject: [PATCH] fix review problems
---
.../cluster_impl/failover_cluster_invoker.go | 2 +-
cluster/directory/base_directory.go | 24 +++++++++----------
cluster/directory/static_directory.go | 2 +-
registry/directory/directory.go | 7 +++---
registry/directory/directory_test.go | 3 +--
5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/cluster/cluster_impl/failover_cluster_invoker.go b/cluster/cluster_impl/failover_cluster_invoker.go
index 880fa94d0..dcce73699 100644
--- a/cluster/cluster_impl/failover_cluster_invoker.go
+++ b/cluster/cluster_impl/failover_cluster_invoker.go
@@ -83,7 +83,7 @@ func (invoker *failoverClusterInvoker) Invoke(invocation protocol.Invocation) pr
if err != nil {
return &protocol.RPCResult{Err: err}
}
- invokers := invoker.directory.List(invocation)
+ invokers = invoker.directory.List(invocation)
err = invoker.checkInvokers(invokers, invocation)
if err != nil {
return &protocol.RPCResult{Err: err}
diff --git a/cluster/directory/base_directory.go b/cluster/directory/base_directory.go
index eeeb8a741..ac7b04fa3 100644
--- a/cluster/directory/base_directory.go
+++ b/cluster/directory/base_directory.go
@@ -21,32 +21,30 @@ import (
"sync"
)
import (
- "github.com/apache/dubbo-go/cluster"
- "github.com/apache/dubbo-go/common/constant"
- "github.com/apache/dubbo-go/common/extension"
- "github.com/dubbogo/gost/container/gxset"
"go.uber.org/atomic"
)
import (
+ "github.com/apache/dubbo-go/cluster"
"github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/dubbogo/gost/container/gxset"
)
var RouterUrlSet = gxset.NewSet()
type BaseDirectory struct {
- url *common.URL
- ConsumerUrl *common.URL
- destroyed *atomic.Bool
- routers []cluster.Router
- mutex sync.Mutex
- once sync.Once
+ url *common.URL
+ destroyed *atomic.Bool
+ routers []cluster.Router
+ mutex sync.Mutex
+ once sync.Once
}
func NewBaseDirectory(url *common.URL) BaseDirectory {
return BaseDirectory{
- url: url,
- ConsumerUrl: url,
- destroyed: atomic.NewBool(false),
+ url: url,
+ destroyed: atomic.NewBool(false),
}
}
func (dir *BaseDirectory) Destroyed() bool {
diff --git a/cluster/directory/static_directory.go b/cluster/directory/static_directory.go
index ebe76f848..fc3a3326b 100644
--- a/cluster/directory/static_directory.go
+++ b/cluster/directory/static_directory.go
@@ -67,7 +67,7 @@ func (dir *staticDirectory) List(invocation protocol.Invocation) []protocol.Invo
}
for _, router := range localRouters {
if reflect.ValueOf(router.Url()).IsNil() || router.Url().GetParamBool(constant.RUNTIME_KEY, false) {
- return router.Route(invokers, *dir.ConsumerUrl, invocation)
+ return router.Route(invokers, dir.GetUrl(), invocation)
}
}
return invokers
diff --git a/registry/directory/directory.go b/registry/directory/directory.go
index d70dc4f26..96ea612a1 100644
--- a/registry/directory/directory.go
+++ b/registry/directory/directory.go
@@ -22,8 +22,6 @@ import (
"reflect"
"sync"
"time"
-
- "github.com/apache/dubbo-go/cluster"
)
import (
@@ -32,6 +30,7 @@ import (
)
import (
+ "github.com/apache/dubbo-go/cluster"
"github.com/apache/dubbo-go/cluster/directory"
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
@@ -247,11 +246,11 @@ func (dir *registryDirectory) List(invocation protocol.Invocation) []protocol.In
invokers := dir.cacheInvokers
localRouters := dir.Routers()
- fmt.Println("========", len(localRouters))
+ logger.Debug("========", len(localRouters))
if len(localRouters) > 0 {
for _, router := range localRouters {
if reflect.ValueOf(router.Url()).IsValid() || router.Url().GetParamBool(constant.RUNTIME_KEY, false) {
- invokers = router.Route(invokers, *dir.ConsumerUrl, invocation)
+ invokers = router.Route(invokers, dir.GetUrl(), invocation)
}
}
}
diff --git a/registry/directory/directory_test.go b/registry/directory/directory_test.go
index e9f62dc56..b3c1d35aa 100644
--- a/registry/directory/directory_test.go
+++ b/registry/directory/directory_test.go
@@ -118,8 +118,7 @@ func Test_List(t *testing.T) {
registryDirectory, _ := normalRegistryDir()
time.Sleep(1e9)
- invokers := registryDirectory.List(&invocation.RPCInvocation{})
- assert.Len(t, invokers, 3)
+ assert.Len(t, registryDirectory.List(&invocation.RPCInvocation{}), 3)
assert.Equal(t, true, registryDirectory.IsAvailable())
}
--
GitLab