Merge pull request #1 from kzhan/feature/grcp_connect_timeout

Feature/grcp connect timeout

README.md

@@ -73,6 +73,7 @@ Finished List:
 - Router
     * [Condition router](https://github.com/apache/dubbo-go/pull/294)
     * [Health check router](https://github.com/apache/dubbo-go/pull/389)
+    * [Dynamic_tag_router](https://github.com/apache/dubbo-go/pull/703)
 
 - Registry
     * ZooKeeper
@@ -134,6 +135,10 @@ Finished List:
     * [Nacos](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/nacos/service_discovery.go)
     * [Zookeeper](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/zookeeper/service_discovery.go)
     * [Etcd](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/etcdv3/service_discovery.go)
+    * [File](https://github.com/apache/dubbo-go/pull/732)
+
+- Tool
+    * [Dubbo-go-cli](https://github.com/apache/dubbo-go/pull/818)
 
 You can know more about dubbo-go by its [roadmap](https://github.com/apache/dubbo-go/wiki/Roadmap).
 

README_CN.md

@@ -72,6 +72,7 @@ Apache License, Version 2.0
 - 路由器
     * [Condition router](https://github.com/apache/dubbo-go/pull/294)
     * [Health check router](https://github.com/apache/dubbo-go/pull/389)
+    * [Dynamic_tag_router](https://github.com/apache/dubbo-go/pull/703)
 
 - 注册中心
     * ZooKeeper
@@ -133,6 +134,10 @@ Apache License, Version 2.0
     * [Nacos](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/nacos/service_discovery.go)
     * [Zookeeper](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/zookeeper/service_discovery.go)
     * [Etcd](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/etcdv3/service_discovery.go)
+    * [File](https://github.com/apache/dubbo-go/pull/732)
+
+- 工具箱
+    * [Dubbo-go-cli](https://github.com/apache/dubbo-go/pull/818)
 
 你可以通过访问 [roadmap](https://github.com/apache/dubbo-go/wiki/Roadmap) 知道更多关于 dubbo-go 的信息。
 

cluster/router/chain/chain_test.go

@@ -25,6 +25,8 @@ import (
 )
 
 import (
+	zk "github.com/dubbogo/go-zookeeper/zk"
+	gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -38,7 +40,6 @@ import (
 	_ "github.com/apache/dubbo-go/config_center/zookeeper"
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/invocation"
-	"github.com/apache/dubbo-go/remoting/zookeeper"
 )
 
 const (
@@ -53,16 +54,19 @@ const (
 	consumerFormat   = "consumer://%s/com.foo.BarService"
 	dubboForamt      = "dubbo://%s:%d/com.foo.BarService"
 	anyUrlFormat     = "condition://%s/com.foo.BarService"
-	zk               = "zookeeper"
+	zkName           = "zookeeper"
 	applicationKey   = "test-condition"
 	applicationField = "application"
 	forceField       = "force"
 	forceValue       = "true"
 )
 
+var zkCluster *zk.TestCluster
+
 func TestNewRouterChain(t *testing.T) {
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
+	ts, z, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second)
 	assert.NoError(t, err)
+	zkCluster = ts
 	err = z.Create(path)
 	assert.NoError(t, err)
 	testyml := `scope: application
@@ -77,12 +81,12 @@ conditions:
 	_, err = z.Conn.Set(path, []byte(testyml), 0)
 	assert.NoError(t, err)
 	defer func() {
-		_ = ts.Stop()
+		z.Delete(path)
 		z.Close()
 	}()
 
 	zkUrl, _ := common.NewURL(fmt.Sprintf(zkFormat, localIP, ts.Servers[0].Port))
-	configuration, err := extension.GetConfigCenterFactory(zk).GetDynamicConfiguration(zkUrl)
+	configuration, err := extension.GetConfigCenterFactory(zkName).GetDynamicConfiguration(zkUrl)
 	config.GetEnvInstance().SetDynamicConfiguration(configuration)
 
 	assert.Nil(t, err)
@@ -114,7 +118,7 @@ func TestNewRouterChainURLNil(t *testing.T) {
 }
 
 func TestRouterChainAddRouters(t *testing.T) {
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
+	_, z, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second, gxzookeeper.WithTestCluster(zkCluster))
 	assert.NoError(t, err)
 	err = z.Create(path)
 	assert.NoError(t, err)
@@ -131,13 +135,12 @@ conditions:
 	_, err = z.Conn.Set(path, []byte(testyml), 0)
 	assert.NoError(t, err)
 	defer func() {
-		_ = ts.Stop()
-		assert.NoError(t, err)
+		z.Delete(path)
 		z.Close()
 	}()
 
-	zkUrl, _ := common.NewURL(fmt.Sprintf(zkFormat, localIP, ts.Servers[0].Port))
-	configuration, err := extension.GetConfigCenterFactory(zk).GetDynamicConfiguration(zkUrl)
+	zkUrl, _ := common.NewURL(fmt.Sprintf(zkFormat, localIP, zkCluster.Servers[0].Port))
+	configuration, err := extension.GetConfigCenterFactory(zkName).GetDynamicConfiguration(zkUrl)
 	assert.NoError(t, err)
 	config.GetEnvInstance().SetDynamicConfiguration(configuration)
 
@@ -164,15 +167,10 @@ conditions:
 }
 
 func TestRouterChainRoute(t *testing.T) {
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
-	defer func() {
-		err = ts.Stop()
-		assert.NoError(t, err)
-		z.Close()
-	}()
-
+	ts, _, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second, gxzookeeper.WithTestCluster(zkCluster))
+	assert.Nil(t, err)
 	zkUrl, _ := common.NewURL(fmt.Sprintf(zkFormat, localIP, ts.Servers[0].Port))
-	configuration, err := extension.GetConfigCenterFactory(zk).GetDynamicConfiguration(zkUrl)
+	configuration, err := extension.GetConfigCenterFactory(zkName).GetDynamicConfiguration(zkUrl)
 	assert.NoError(t, err)
 	config.GetEnvInstance().SetDynamicConfiguration(configuration)
 
@@ -197,7 +195,7 @@ func TestRouterChainRoute(t *testing.T) {
 }
 
 func TestRouterChainRouteAppRouter(t *testing.T) {
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
+	ts, z, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second, gxzookeeper.WithTestCluster(zkCluster))
 	assert.NoError(t, err)
 	err = z.Create(path)
 	assert.NoError(t, err)
@@ -214,13 +212,12 @@ conditions:
 	_, err = z.Conn.Set(path, []byte(testyml), 0)
 	assert.NoError(t, err)
 	defer func() {
-		_ = ts.Stop()
-		assert.NoError(t, err)
+		z.Delete(path)
 		z.Close()
 	}()
 
 	zkUrl, _ := common.NewURL(fmt.Sprintf(zkFormat, localIP, ts.Servers[0].Port))
-	configuration, err := extension.GetConfigCenterFactory(zk).GetDynamicConfiguration(zkUrl)
+	configuration, err := extension.GetConfigCenterFactory(zkName).GetDynamicConfiguration(zkUrl)
 	assert.NoError(t, err)
 	config.GetEnvInstance().SetDynamicConfiguration(configuration)
 
@@ -242,7 +239,7 @@ conditions:
 }
 
 func TestRouterChainRouteNoRoute(t *testing.T) {
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
+	ts, z, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second, gxzookeeper.WithTestCluster(zkCluster))
 	assert.Nil(t, err)
 	defer func() {
 		_ = ts.Stop()
@@ -251,7 +248,7 @@ func TestRouterChainRouteNoRoute(t *testing.T) {
 	}()
 
 	zkUrl, _ := common.NewURL(fmt.Sprintf(zkFormat, localIP, ts.Servers[0].Port))
-	configuration, err := extension.GetConfigCenterFactory(zk).GetDynamicConfiguration(zkUrl)
+	configuration, err := extension.GetConfigCenterFactory(zkName).GetDynamicConfiguration(zkUrl)
 	config.GetEnvInstance().SetDynamicConfiguration(configuration)
 	assert.Nil(t, err)
 

cluster/router/condition/app_router_test.go

@@ -24,6 +24,7 @@ import (
 )
 
 import (
+	gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -35,7 +36,6 @@ import (
 	"github.com/apache/dubbo-go/config_center"
 	_ "github.com/apache/dubbo-go/config_center/zookeeper"
 	"github.com/apache/dubbo-go/remoting"
-	"github.com/apache/dubbo-go/remoting/zookeeper"
 )
 
 const (
@@ -60,15 +60,14 @@ runtime: false
 conditions:
   - => host != 172.22.3.91
 `
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
+	ts, z, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second)
 	assert.NoError(t, err)
 	err = z.Create(routerPath)
 	assert.NoError(t, err)
 
 	_, err = z.Conn.Set(routerPath, []byte(testYML), 0)
 	assert.NoError(t, err)
 	defer func() {
-		err = ts.Stop()
 		assert.NoError(t, err)
 		z.Close()
 	}()
@@ -116,15 +115,14 @@ conditions:
   - => host != 172.22.3.91
   - host = 192.168.199.208 => host = 192.168.199.208
 `
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
+	ts, z, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second)
 	assert.NoError(t, err)
 	err = z.Create(routerPath)
 	assert.NoError(t, err)
 
 	_, err = z.Conn.Set(routerPath, []byte(testYML), 0)
 	assert.NoError(t, err)
 	defer func() {
-		err = ts.Stop()
 		assert.NoError(t, err)
 		z.Close()
 	}()
@@ -163,7 +161,7 @@ runtime: false
 conditions:
   - => host != 172.22.3.91
 `
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
+	ts, z, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second)
 	assert.NoError(t, err)
 	err = z.Create(routerPath)
 	assert.NoError(t, err)

cluster/router/tag/tag_router_test.go

@@ -27,6 +27,7 @@ import (
 import (
 	"github.com/RoaringBitmap/roaring"
 	"github.com/dubbogo/go-zookeeper/zk"
+	gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
@@ -43,7 +44,6 @@ import (
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/invocation"
 	"github.com/apache/dubbo-go/remoting"
-	"github.com/apache/dubbo-go/remoting/zookeeper"
 )
 
 const (
@@ -260,7 +260,7 @@ type DynamicTagRouter struct {
 	//rule *RouterRule
 
 	route       *tagRouter
-	zkClient    *zookeeper.ZookeeperClient
+	zkClient    *gxzookeeper.ZookeeperClient
 	testCluster *zk.TestCluster
 	invokers    []protocol.Invoker
 	url         *common.URL
@@ -299,7 +299,7 @@ tags:
   - name: tag3
     addresses: ["127.0.0.1:20003", "127.0.0.1:20004"]
 `
-	ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
+	ts, z, _, err := gxzookeeper.NewMockZookeeperClient("test", 15*time.Second)
 	suite.NoError(err)
 	err = z.Create(routerPath)
 	suite.NoError(err)
@@ -334,8 +334,6 @@ tags:
 
 func (suite *DynamicTagRouter) TearDownTest() {
 	suite.zkClient.Close()
-	err := suite.testCluster.Stop()
-	suite.Nil(err)
 }
 
 func (suite *DynamicTagRouter) TestDynamicTagRouterSetByIPv4() {

common/config/environment.go

@@ -72,22 +72,34 @@ func (env *Environment) UpdateExternalConfigMap(externalMap map[string]string) {
 	for k, v := range externalMap {
 		env.externalConfigMap.Store(k, v)
 	}
+	env.externalConfigMap.Range(func(key, value interface{}) bool {
+		if _, ok := externalMap[key.(string)]; !ok {
+			env.externalConfigMap.Delete(key)
+		}
+		return true
+	})
 }
 
 // UpdateAppExternalConfigMap updates env appExternalConfigMap field
 func (env *Environment) UpdateAppExternalConfigMap(externalMap map[string]string) {
 	for k, v := range externalMap {
 		env.appExternalConfigMap.Store(k, v)
 	}
+	env.appExternalConfigMap.Range(func(key, value interface{}) bool {
+		if _, ok := externalMap[key.(string)]; !ok {
+			env.appExternalConfigMap.Delete(key)
+		}
+		return true
+	})
 }
 
 // Configuration puts externalConfigMap and appExternalConfigMap into list
 // List represents a doubly linked list.
 func (env *Environment) Configuration() *list.List {
 	cfgList := list.New()
-	// The sequence would be: SystemConfiguration -> ExternalConfiguration -> AppExternalConfiguration -> AbstractConfig -> PropertiesConfiguration
-	cfgList.PushFront(newInmemoryConfiguration(&(env.externalConfigMap)))
-	cfgList.PushFront(newInmemoryConfiguration(&(env.appExternalConfigMap)))
+	// The sequence would be: SystemConfiguration -> AppExternalConfiguration -> ExternalConfiguration -> AbstractConfig -> PropertiesConfiguration
+	cfgList.PushBack(newInmemoryConfiguration(&(env.appExternalConfigMap)))
+	cfgList.PushBack(newInmemoryConfiguration(&(env.externalConfigMap)))
 	return cfgList
 }
 

common/config/environment_test.go

@@ -34,6 +34,29 @@ func TestEnvironmentUpdateExternalConfigMap(t *testing.T) {
 	v, ok := GetEnvInstance().externalConfigMap.Load("1")
 	assert.True(t, ok)
 	assert.Equal(t, "2", v)
+
+	GetEnvInstance().UpdateExternalConfigMap(map[string]string{"a": "b"})
+	v, ok = GetEnvInstance().externalConfigMap.Load("a")
+	assert.True(t, ok)
+	assert.Equal(t, "b", v)
+	v, ok = GetEnvInstance().externalConfigMap.Load("1")
+	assert.False(t, ok)
+	assert.Equal(t, nil, v)
+}
+
+func TestEnvironmentUpdateAppExternalConfigMap(t *testing.T) {
+	GetEnvInstance().UpdateAppExternalConfigMap(map[string]string{"1": "2"})
+	v, ok := GetEnvInstance().appExternalConfigMap.Load("1")
+	assert.True(t, ok)
+	assert.Equal(t, "2", v)
+
+	GetEnvInstance().UpdateAppExternalConfigMap(map[string]string{"a": "b"})
+	v, ok = GetEnvInstance().appExternalConfigMap.Load("a")
+	assert.True(t, ok)
+	assert.Equal(t, "b", v)
+	v, ok = GetEnvInstance().appExternalConfigMap.Load("1")
+	assert.False(t, ok)
+	assert.Equal(t, nil, v)
 }
 
 func TestEnvironmentConfigurationAndGetProperty(t *testing.T) {

config/base_config.go

@@ -50,6 +50,9 @@ type BaseConfig struct {
 	EventDispatcherType string        `default:"direct" yaml:"event_dispatcher_type" json:"event_dispatcher_type,omitempty"`
 	MetricConfig        *MetricConfig `yaml:"metrics" json:"metrics,omitempty"`
 	fileStream          *bytes.Buffer
+
+	// cache file used to store the current used configurations.
+	CacheFile string `yaml:"cache_file" json:"cache_file,omitempty" property:"cache_file"`
 }
 
 // nolint
@@ -240,7 +243,7 @@ func setFieldValue(val reflect.Value, id reflect.Value, config *config.InmemoryC
 
 func (c *BaseConfig) fresh() {
 	configList := config.GetEnvInstance().Configuration()
-	for element := configList.Front(); element != nil; element = element.Next() {
+	for element := configList.Back(); element != nil; element = element.Prev() {
 		cfg := element.Value.(*config.InmemoryConfiguration)
 		c.freshInternalConfig(cfg)
 	}