Merge pull request #113 from hxmhlt/config_center

Add:registries config option in referenceConfig & serviceConfig

config/config_loader_test.go

@@ -83,7 +83,34 @@ func TestLoad(t *testing.T) {
 	consumerConfig = nil
 	providerConfig = nil
 }
+func TestWithNoRegLoad(t *testing.T) {
+	doInit()
+	doinit()
+	providerConfig.Services["MockService"].Registry = ""
+	consumerConfig.References["MockService"].Registry = ""
+	ms := &MockService{}
+	SetConsumerService(ms)
+	SetProviderService(ms)
+
+	extension.SetProtocol("registry", GetProtocol)
+	extension.SetCluster("registryAware", cluster_impl.NewRegistryAwareCluster)
+	extension.SetProxyFactory("default", proxy_factory.NewDefaultProxyFactory)
+
+	Load()
+
+	assert.Equal(t, ms, GetRPCService(ms.Service()))
+	ms2 := &struct {
+		MockService
+	}{}
+	RPCService(ms2)
+	assert.NotEqual(t, ms2, GetRPCService(ms2.Service()))
 
+	conServices = map[string]common.RPCService{}
+	proServices = map[string]common.RPCService{}
+	common.ServiceMap.UnRegister("mock", "MockService")
+	consumerConfig = nil
+	providerConfig = nil
+}
 func TestConfigLoaderWithConfigCenter(t *testing.T) {
 	extension.SetConfigCenterFactory("mock", func() config_center.DynamicConfigurationFactory {
 		return &config_center.MockDynamicConfigurationFactory{}

config/reference_config.go

@@ -38,29 +38,27 @@ import (
 type ReferenceConfig struct {
 	context       context.Context
 	pxy           *proxy.Proxy
-	InterfaceName string `required:"true"  yaml:"interface"  json:"interface,omitempty" property:"interface"`
-	Check         *bool  `yaml:"check"  json:"check,omitempty" property:"check"`
-	Url           string `yaml:"url"  json:"url,omitempty" property:"url"`
-	Filter        string `yaml:"filter" json:"filter,omitempty" property:"filter"`
-	Protocol      string `yaml:"protocol"  json:"protocol,omitempty" property:"protocol"`
-	//Registries    []ConfigRegistry `required:"true"  yaml:"registries"  json:"registries,omitempty" property:"registries"`
-	Cluster     string          `yaml:"cluster"  json:"cluster,omitempty" property:"cluster"`
-	Loadbalance string          `yaml:"loadbalance"  json:"loadbalance,omitempty" property:"loadbalance"`
-	Retries     int64           `yaml:"retries"  json:"retries,omitempty" property:"retries"`
-	Group       string          `yaml:"group"  json:"group,omitempty" property:"group"`
-	Version     string          `yaml:"version"  json:"version,omitempty" property:"version"`
-	Methods     []*MethodConfig `yaml:"methods"  json:"methods,omitempty" property:"methods"`
-	async       bool            `yaml:"async"  json:"async,omitempty" property:"async"`
-	invoker     protocol.Invoker
-	urls        []*common.URL
+	InterfaceName string          `required:"true"  yaml:"interface"  json:"interface,omitempty" property:"interface"`
+	Check         *bool           `yaml:"check"  json:"check,omitempty" property:"check"`
+	Url           string          `yaml:"url"  json:"url,omitempty" property:"url"`
+	Filter        string          `yaml:"filter" json:"filter,omitempty" property:"filter"`
+	Protocol      string          `yaml:"protocol"  json:"protocol,omitempty" property:"protocol"`
+	Registry      string          `yaml:"registry"  json:"registry,omitempty"  property:"registry"`
+	Cluster       string          `yaml:"cluster"  json:"cluster,omitempty" property:"cluster"`
+	Loadbalance   string          `yaml:"loadbalance"  json:"loadbalance,omitempty" property:"loadbalance"`
+	Retries       int64           `yaml:"retries"  json:"retries,omitempty" property:"retries"`
+	Group         string          `yaml:"group"  json:"group,omitempty" property:"group"`
+	Version       string          `yaml:"version"  json:"version,omitempty" property:"version"`
+	Methods       []*MethodConfig `yaml:"methods"  json:"methods,omitempty" property:"methods"`
+	async         bool            `yaml:"async"  json:"async,omitempty" property:"async"`
+	invoker       protocol.Invoker
+	urls          []*common.URL
 }
 
 func (c *ReferenceConfig) Prefix() string {
 	return constant.ReferenceConfigPrefix + c.InterfaceName + "."
 }
 
-type ConfigRegistry string
-
 func NewReferenceConfig(ctx context.Context) *ReferenceConfig {
 	return &ReferenceConfig{context: ctx}
 }
@@ -102,7 +100,7 @@ func (refconfig *ReferenceConfig) Refer() {
 		}
 	} else {
 		//2. assemble SubURL from register center's configuration模式
-		refconfig.urls = loadRegistries(consumerConfig.Registries, common.CONSUMER)
+		refconfig.urls = loadRegistries(refconfig.Registry, consumerConfig.Registries, common.CONSUMER)
 
 		//set url to regUrls
 		for _, regUrl := range refconfig.urls {

config/reference_config_test.go

@@ -80,6 +80,7 @@ func doInit() {
 		},
 		References: map[string]*ReferenceConfig{
 			"MockService": {
+				Registry:      "shanghai_reg1,shanghai_reg2,hangzhou_reg1,hangzhou_reg2",
 				InterfaceName: "MockService",
 				Protocol:      "mock",
 				Cluster:       "failover",

config/registry_config.go

@@ -21,6 +21,7 @@ import (
 	"context"
 	"net/url"
 	"strconv"
+	"strings"
 )
 
 import (
@@ -44,22 +45,42 @@ func (*RegistryConfig) Prefix() string {
 	return constant.RegistryConfigPrefix
 }
 
-func loadRegistries(registries map[string]*RegistryConfig, roleType common.RoleType) []*common.URL {
+func loadRegistries(targetRegistries string, registries map[string]*RegistryConfig, roleType common.RoleType) []*common.URL {
 	var urls []*common.URL
-	for k, registryConf := range registries {
+	trSlice := strings.Split(targetRegistries, ",")
 
-		url, err := common.NewURL(
-			context.TODO(),
-			constant.REGISTRY_PROTOCOL+"://"+registryConf.Address,
-			common.WithParams(registryConf.getUrlMap(roleType)),
-			common.WithUsername(registryConf.Username),
-			common.WithPassword(registryConf.Password),
-		)
+	for k, registryConf := range registries {
+		target := false
 
-		if err != nil {
-			logger.Errorf("The registry id:%s url is invalid ,and will skip the registry, error: %#v", k, err)
+		// if user not config targetRegistries,default load all
+		// Notice:in func "func Split(s, sep string) []string"  comment : if s does not contain sep and sep is not empty, SplitAfter returns a slice of length 1 whose only element is s.
+		// So we have to add the condition when targetRegistries string is not set (it will be "" when not set)
+		if len(trSlice) == 0 || (len(trSlice) == 1 && trSlice[0] == "") {
+			target = true
 		} else {
-			urls = append(urls, &url)
+			// else if user config targetRegistries
+			for _, tr := range trSlice {
+				if tr == k {
+					target = true
+					break
+				}
+			}
+		}
+
+		if target {
+			url, err := common.NewURL(
+				context.TODO(),
+				constant.REGISTRY_PROTOCOL+"://"+registryConf.Address,
+				common.WithParams(registryConf.getUrlMap(roleType)),
+				common.WithUsername(registryConf.Username),
+				common.WithPassword(registryConf.Password),
+			)
+
+			if err != nil {
+				logger.Errorf("The registry id:%s url is invalid ,and will skip the registry, error: %#v", k, err)
+			} else {
+				urls = append(urls, &url)
+			}
 		}
 
 	}

config/service_config.go

@@ -43,17 +43,17 @@ import (
 
 type ServiceConfig struct {
 	context       context.Context
-	Filter        string           `yaml:"filter" json:"filter,omitempty" property:"filter"`
-	Protocol      string           `required:"true"  yaml:"protocol"  json:"protocol,omitempty" property:"protocol"` //multi protocol support, split by ','
-	InterfaceName string           `required:"true"  yaml:"interface"  json:"interface,omitempty" property:"interface"`
-	Registries    []ConfigRegistry `required:"true"  yaml:"registries"  json:"registries,omitempty"  property:"registries"`
-	Cluster       string           `default:"failover" yaml:"cluster"  json:"cluster,omitempty" property:"cluster"`
-	Loadbalance   string           `default:"random" yaml:"loadbalance"  json:"loadbalance,omitempty"  property:"loadbalance"`
-	Group         string           `yaml:"group"  json:"group,omitempty" property:"group"`
-	Version       string           `yaml:"version"  json:"version,omitempty" property:"version" `
-	Methods       []*MethodConfig  `yaml:"methods"  json:"methods,omitempty" property:"methods"`
-	Warmup        string           `yaml:"warmup"  json:"warmup,omitempty"  property:"warmup"`
-	Retries       int64            `yaml:"retries"  json:"retries,omitempty" property:"retries"`
+	Filter        string          `yaml:"filter" json:"filter,omitempty" property:"filter"`
+	Protocol      string          `required:"true"  yaml:"protocol"  json:"protocol,omitempty" property:"protocol"` //multi protocol support, split by ','
+	InterfaceName string          `required:"true"  yaml:"interface"  json:"interface,omitempty" property:"interface"`
+	Registry      string          `yaml:"registry"  json:"registry,omitempty"  property:"registry"`
+	Cluster       string          `default:"failover" yaml:"cluster"  json:"cluster,omitempty" property:"cluster"`
+	Loadbalance   string          `default:"random" yaml:"loadbalance"  json:"loadbalance,omitempty"  property:"loadbalance"`
+	Group         string          `yaml:"group"  json:"group,omitempty" property:"group"`
+	Version       string          `yaml:"version"  json:"version,omitempty" property:"version" `
+	Methods       []*MethodConfig `yaml:"methods"  json:"methods,omitempty" property:"methods"`
+	Warmup        string          `yaml:"warmup"  json:"warmup,omitempty"  property:"warmup"`
+	Retries       int64           `yaml:"retries"  json:"retries,omitempty" property:"retries"`
 	unexported    *atomic.Bool
 	exported      *atomic.Bool
 	rpcService    common.RPCService
@@ -88,7 +88,7 @@ func (srvconfig *ServiceConfig) Export() error {
 		return nil
 	}
 
-	regUrls := loadRegistries(providerConfig.Registries, common.PROVIDER)
+	regUrls := loadRegistries(srvconfig.Registry, providerConfig.Registries, common.PROVIDER)
 	urlMap := srvconfig.getUrlMap()
 
 	for _, proto := range loadProtocol(srvconfig.Protocol, providerConfig.Protocols) {

config/service_config_test.go

@@ -76,7 +76,7 @@ func doinit() {
 			"MockService": {
 				InterfaceName: "MockService",
 				Protocol:      "mock",
-				Registries:    []ConfigRegistry{"shanghai_reg1", "shanghai_reg2", "hangzhou_reg1", "hangzhou_reg2"},
+				Registry:      "shanghai_reg1,shanghai_reg2,hangzhou_reg1,hangzhou_reg2",
 				Cluster:       "failover",
 				Loadbalance:   "random",
 				Retries:       3,

config/testdata/consumer_config.yml

@@ -19,15 +19,13 @@ application_config:
 registries :
 
   "hangzhouzk":
-    id: "hangzhouzk"
-    type: "zookeeper"
+    protocol: "zookeeper"
     timeout	: "3s"
     address: "127.0.0.1:2181"
     username: ""
     password: ""
   "shanghaizk":
-    id: "shanghaizk"
-    type: "zookeeper"
+    protocol: "zookeeper"
     timeout	: "3s"
     address: "127.0.0.1:2182"
     username: ""
@@ -35,6 +33,7 @@ registries :
 
 references:
   "UserProvider":
+    registry: "hangzhouzk,shanghaizk"
     filter: ""
     protocol : "dubbo"
     interface : "com.ikurento.user.UserProvider"

config/testdata/consumer_config_with_configcenter.yml

@@ -5,6 +5,7 @@ config_center:
   address: "127.0.0.1"
 references:
   "UserProvider":
+    registry: "hangzhouzk,shanghaizk"
     filter: ""
     protocol : "dubbo"
     interface : "com.ikurento.user.UserProvider"

config/testdata/provider_config.yml

@@ -12,13 +12,13 @@ application_config:
 
 registries :
   "hangzhouzk":
-    type: "zookeeper"
+    protocol: "zookeeper"
     timeout	: "3s"
     address: "127.0.0.1:2181"
     username: ""
     password: ""
   "shanghaizk":
-    type: "zookeeper"
+    protocol: "zookeeper"
     timeout	: "3s"
     address: "127.0.0.1:2182"
     username: ""
@@ -27,6 +27,7 @@ registries :
 
 services:
   "UserProvider":
+    registry: "hangzhouzk,shanghaizk"
     filter: ""
     protocol : "dubbo"
     # equivalent to interface of dubbo.xml

examples/dubbo/go-client/profiles/dev/client.yml

@@ -33,6 +33,8 @@ registries :
 
 references:
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "dubbo"
     interface : "com.ikurento.user.UserProvider"
     cluster: "failover"

examples/dubbo/go-client/profiles/release/client.yml

@@ -32,6 +32,8 @@ registries :
 
 references:
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "dubbo"
 #    version: "2.0"
 #    group: "as"

examples/dubbo/go-client/profiles/test/client.yml

@@ -32,6 +32,8 @@ registries :
 
 references:
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "dubbo"
 #    version: "2.0"
 #    group: "as"

examples/dubbo/go-server/profiles/dev/server.yml

@@ -29,6 +29,8 @@ registries :
 services:
 
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "dubbo"
     # 相当于dubbo.xml中的interface
     interface : "com.ikurento.user.UserProvider"

examples/dubbo/go-server/profiles/release/server.yml

@@ -27,6 +27,8 @@ registries :
 
 services:
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "dubbo"
     # 相当于dubbo.xml中的interface
     interface : "com.ikurento.user.UserProvider"

examples/dubbo/go-server/profiles/test/server.yml

@@ -27,6 +27,8 @@ registries :
 
 services:
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "dubbo"
     # 相当于dubbo.xml中的interface
     interface : "com.ikurento.user.UserProvider"

examples/jsonrpc/go-client/profiles/dev/client.yml

@@ -31,6 +31,8 @@ registries :
 
 references:
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "jsonrpc"
 #    version : "2.0"
 #    group: "as"

examples/jsonrpc/go-client/profiles/release/client.yml

@@ -31,6 +31,8 @@ registries :
 
 references:
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "jsonrpc"
 #    version : "2.0"
 #    group: "as"

examples/jsonrpc/go-client/profiles/test/client.yml

@@ -31,6 +31,8 @@ registries :
 
 references:
   "UserProvider":
+    # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+    registry: "hangzhouzk"
     protocol : "jsonrpc"
 #    version : "2.0"
 #    group: "as"

examples/jsonrpc/go-server/profiles/dev/server.yml

@@ -26,8 +26,10 @@ registries :
 
 services:
  "UserProvider":
+   # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+   registry: "hangzhouzk"
    protocol : "jsonrpc"
-     # 相当于dubbo.xml中的interface
+  # 相当于dubbo.xml中的interface
    interface : "com.ikurento.user.UserProvider"
    loadbalance: "random"
    warmup: "100"

examples/jsonrpc/go-server/profiles/release/server.yml

@@ -26,8 +26,10 @@ registries :
 
 services:
  "UserProvider":
+   # 可以指定多个registry，使用逗号隔开;不指定默认向所有注册中心注册
+   registry: "hangzhouzk"
    protocol : "jsonrpc"
-     # 相当于dubbo.xml中的interface
+  # 相当于dubbo.xml中的interface
    interface : "com.ikurento.user.UserProvider"
    loadbalance: "random"
    warmup: "100"
@@ -37,7 +39,6 @@ services:
        retries: 1
        loadbalance: "random"
 
-
 protocols:
   #-   name: "dubbo"
   #    ip : "127.0.0.1"