You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/01/02 18:16:06 UTC
[dubbo-go] branch develop updated (854e0d0 -> 8884462)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.
omit 854e0d0 add error check
new 8884462 fix lint errors
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (854e0d0)
\
N -- N -- N refs/heads/develop (8884462)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cluster/router/condition/file_test.go | 6 ++--
common/logger/logger.go | 5 ++--
common/proxy/proxy_test.go | 8 ++----
common/url.go | 38 ++++++++++---------------
config/base_config_test.go | 4 ++-
config/config_loader_test.go | 18 ++++--------
config/registry_config_test.go | 5 ++--
config/service_config_test.go | 3 +-
config_center/apollo/impl_test.go | 2 +-
config_center/nacos/impl_test.go | 3 +-
filter/filter_impl/auth/sign_util.go | 8 +-----
go.mod | 2 ++
metadata/report/zookeeper/report_test.go | 5 +---
metadata/service/inmemory/service_proxy_test.go | 21 +++++---------
protocol/dubbo/hessian2/hessian_request.go | 20 +++----------
protocol/jsonrpc/http.go | 8 ++----
protocol/jsonrpc/server.go | 8 ++----
registry/base_configuration_listener.go | 12 ++------
registry/directory/directory.go | 4 +--
registry/zookeeper/registry_test.go | 12 +++-----
registry/zookeeper/service_discovery_test.go | 10 ++-----
remoting/getty/getty_client_test.go | 7 ++---
remoting/getty/pool.go | 20 ++++---------
remoting/zookeeper/client_test.go | 25 ++++------------
24 files changed, 79 insertions(+), 175 deletions(-)
[dubbo-go] 01/01: fix lint errors
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit 8884462cea3b9f4a4e91552309d046f3e8293c61
Author: AlexStocks <al...@foxmail.com>
AuthorDate: Sun Jan 3 02:15:44 2021 +0800
fix lint errors
---
cluster/cluster_impl/failback_cluster_invoker.go | 7 +++++--
cluster/router/condition/file_test.go | 3 +++
cluster/router/tag/tag_router_test.go | 5 +++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cluster/cluster_impl/failback_cluster_invoker.go b/cluster/cluster_impl/failback_cluster_invoker.go
index 62f4804..7654e42 100644
--- a/cluster/cluster_impl/failback_cluster_invoker.go
+++ b/cluster/cluster_impl/failback_cluster_invoker.go
@@ -121,8 +121,11 @@ func (invoker *failbackClusterInvoker) checkRetry(retryTask *retryTimerTask, err
if retryTask.retries > invoker.maxRetries {
logger.Errorf("Failed retry times exceed threshold (%v), We have to abandon, invocation-> %v.\n",
retryTask.retries, retryTask.invocation)
- } else {
- invoker.taskList.Put(retryTask)
+ return
+ }
+
+ if err := invoker.taskList.Put(retryTask); err != nil {
+ logger.Errorf("invoker.taskList.Put(retryTask:%#v) = error:%v", retryTask, err)
}
}
diff --git a/cluster/router/condition/file_test.go b/cluster/router/condition/file_test.go
index d609c7d..441e91e 100644
--- a/cluster/router/condition/file_test.go
+++ b/cluster/router/condition/file_test.go
@@ -89,18 +89,21 @@ func TestParseServiceRouterKey(t *testing.T) {
assert.Equal(t, "mock-group", grp)
assert.Equal(t, "mock-service", srv)
assert.Equal(t, "1.0.0", ver)
+ assert.Nil(t, err)
testString = "mock-group/mock-service"
grp, srv, ver, err = parseServiceRouterKey(testString)
assert.Equal(t, "mock-group", grp)
assert.Equal(t, "mock-service", srv)
assert.Equal(t, "", ver)
+ assert.Nil(t, err)
testString = "mock-service:1.0.0"
grp, srv, ver, err = parseServiceRouterKey(testString)
assert.Equal(t, "", grp)
assert.Equal(t, "mock-service", srv)
assert.Equal(t, "1.0.0", ver)
+ assert.Nil(t, err)
testString = "mock-service"
grp, srv, ver, err = parseServiceRouterKey(testString)
diff --git a/cluster/router/tag/tag_router_test.go b/cluster/router/tag/tag_router_test.go
index d27e644..20b511d 100644
--- a/cluster/router/tag/tag_router_test.go
+++ b/cluster/router/tag/tag_router_test.go
@@ -73,7 +73,7 @@ const (
)
var (
- zkFormat = "zookeeper://%s:%d"
+ zkFormat = "zookeeper://%s:%d"
)
// MockInvoker is only mock the Invoker to support test tagRouter
@@ -309,7 +309,8 @@ tags:
func (suite *DynamicTagRouter) TearDownTest() {
suite.zkClient.Close()
- suite.testCluster.Stop()
+ err := suite.testCluster.Stop()
+ suite.Nil(err)
}
func (suite *DynamicTagRouter) TestDynamicTagRouterSetByIPv4() {