diff --git a/config/config_loader.go b/config/config_loader.go
index e1f55b373fe4bfcbc817bbc7f210e4effbe65572..3b731323a9e5e6b0ca51a7bdd35b5298f214679c 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -18,11 +18,13 @@ import (
import (
"github.com/dubbo/go-for-apache-dubbo/common/constant"
+ "github.com/dubbo/go-for-apache-dubbo/version"
)
var (
consumerConfig *ConsumerConfig
providerConfig *ProviderConfig
+ maxWait = 3
)
// loaded comsumer & provider config from xxx.yml, and log config from xxx.xml
@@ -137,7 +139,7 @@ type ConsumerConfig struct {
Request_Timeout string `yaml:"request_timeout" default:"5s" json:"request_timeout,omitempty"`
RequestTimeout time.Duration
-
+ Check *bool `yaml:"check" json:"check,omitempty"`
// application
ApplicationConfig ApplicationConfig `yaml:"application_config" json:"application_config,omitempty"`
Registries []RegistryConfig `yaml:"registries" json:"registries,omitempty"`
@@ -178,9 +180,6 @@ type ProviderConfig struct {
ProtocolConf interface{} `yaml:"protocol_conf" json:"protocol_conf,omitempty"`
}
-func SetProviderConfig(p ProviderConfig) {
- providerConfig = &p
-}
func GetProviderConfig() ProviderConfig {
if providerConfig == nil {
log.Warn("providerConfig is nil!")
@@ -231,6 +230,30 @@ func Load() (map[string]*ReferenceConfig, map[string]*ServiceConfig) {
con.Implement(rpcService)
refMap[con.InterfaceName] = con
}
+
+ //wait for invoker is available, if wait over default 3s, then panic
+ var count int
+ checkok := true
+ for {
+ for _, refconfig := range consumerConfig.References {
+ if ((refconfig.Check != nil && *refconfig.Check) ||
+ (refconfig.Check == nil && consumerConfig.Check != nil && *consumerConfig.Check) ||
+ (refconfig.Check == nil && consumerConfig.Check == nil)) && //default to true
+ !refconfig.invoker.IsAvailable() {
+ checkok = false
+ count++
+ if count > maxWait {
+ panic(fmt.Sprintf("Failed to check the status of the service %v . No provider available for the service to the consumer use dubbo version %v", refconfig.InterfaceName, version.Version))
+ }
+ time.Sleep(time.Second * 1)
+ break
+ }
+ }
+ if checkok {
+ break
+ }
+ checkok = true
+ }
}
// service config
diff --git a/config/consumer_config.yml b/config/consumer_config.yml
deleted file mode 100644
index c76cd3f8352b459e42360076565aeeed15777e90..0000000000000000000000000000000000000000
--- a/config/consumer_config.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-# dubbo client yaml configure file
-
-# pprof
-pprof_enabled : true
-pprof_port : 10086
-
-# client
-request_timeout : "3500ms"
-# connect timeout
-connect_timeout : "100ms"
-
-# application config
-application_config:
- organization : "ikurento.com"
- name : "BDTService"
- module : "dubbogo user-info client"
- version : "0.0.1"
- owner : "ZX"
- environment : "dev"
-
-registries :
- - id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
-# default: "true"
-
- - id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
-
-references:
- - registries :
- - "hangzhouzk"
- - "shanghaizk"
- protocol : "dubbo"
- interface : "com.ikurento.user.UserProvider"
- cluster: "failover"
- methods :
- - name: "GetUser"
- retries: 3
-
-protocol_conf:
- dubbo:
- connection_number: 2
- heartbeat_period: "5s"
- session_timeout: "20s"
- fail_fast_timeout: "5s"
- pool_size: 64
- pool_ttl: 600
- getty_session_param:
- compress_encoding: false
- tcp_no_delay: true
- tcp_keep_alive: true
- keep_alive_period: "120s"
- tcp_r_buf_size: 262144
- tcp_w_buf_size: 65536
- pkg_rq_size: 1024
- pkg_wq_size: 512
- tcp_read_timeout: "1s"
- tcp_write_timeout: "5s"
- wait_timeout: "1s"
- max_msg_len: 1024
- session_name: "client"
diff --git a/config/provider_config.yml b/config/provider_config.yml
deleted file mode 100644
index 44fe81e13ed24473f20227b12c993e63694e26ac..0000000000000000000000000000000000000000
--- a/config/provider_config.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-# dubbo server yaml configure file
-
-# pprof
-pprof_enabled : true
-pprof_port : 20080
-
-# application config
-application_config:
- organization : "ikurento.com"
- name : "BDTService"
- module : "dubbogo user-info server"
- version : "0.0.1"
- owner : "ZX"
- environment : "dev"
-
-registries :
- - id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
-
- - id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
-
-
-services:
- - registries:
- - "hangzhouzk"
- - "shanghaizk"
- protocol : "dubbo,jsonrpc"
- # 鐩稿綋浜巇ubbo.xml涓殑interface
- interface : "com.ikurento.user.UserProvider"
- loadbalance: "random"
- warmup: "100"
- cluster: "failover"
- methods:
- - name: "GetUser"
- retries: 1
- loadbalance: "random"
-
-protocols:
- - name: "dubbo"
- # while using dubbo protocol, ip cannot is 127.0.0.1, because client of java-dubbo will get 'connection refuse'
- ip : "127.0.0.1"
- port : 20000
- - name: "jsonrpc"
- ip: "127.0.0.1"
- port: 20001
-
-protocol_conf:
- dubbo:
- session_number: 700
- fail_fast_timeout: "5s"
- session_timeout: "20s"
- getty_session_param:
- compress_encoding: false
- tcp_no_delay: true
- tcp_keep_alive: true
- keep_alive_period: "120s"
- tcp_r_buf_size: 262144
- tcp_w_buf_size: 65536
- pkg_rq_size: 1024
- pkg_wq_size: 512
- tcp_read_timeout: "1s"
- tcp_write_timeout: "5s"
- wait_timeout: "1s"
- max_msg_len: 1024
- session_name: "server"
diff --git a/config/reference_config.go b/config/reference_config.go
index d06c70e0e4b1169dc77dcd3933e2dcc3b88ad574..7d6a55b70325efb3cf1d37a7887a0af0a75d5312 100644
--- a/config/reference_config.go
+++ b/config/reference_config.go
@@ -20,6 +20,7 @@ type ReferenceConfig struct {
context context.Context
pxy *proxy.Proxy
InterfaceName string `required:"true" yaml:"interface" json:"interface,omitempty"`
+ Check *bool `yaml:"check" json:"check,omitempty"`
Protocol string `yaml:"protocol" json:"protocol,omitempty"`
Registries []ConfigRegistry `required:"true" yaml:"registries" json:"registries,omitempty"`
Cluster string `yaml:"cluster" json:"cluster,omitempty"`
@@ -41,7 +42,16 @@ type ConfigRegistry string
func NewReferenceConfig(ctx context.Context) *ReferenceConfig {
return &ReferenceConfig{context: ctx}
}
+func (refconfig *ReferenceConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+ type rf ReferenceConfig
+ raw := rf{} // Put your defaults here
+ if err := unmarshal(&raw); err != nil {
+ return err
+ }
+ *refconfig = ReferenceConfig(raw)
+ return nil
+}
func (refconfig *ReferenceConfig) Refer() {
//棣栧厛鏄痷ser specified SubURL, could be peer-to-peer address, or register center's address.
@@ -65,6 +75,7 @@ func (refconfig *ReferenceConfig) Refer() {
cluster := extension.GetCluster("registryAware")
refconfig.invoker = cluster.Join(directory.NewStaticDirectory(invokers))
}
+
//create proxy
attachments := map[string]string{}
attachments[constant.ASYNC_KEY] = url.GetParam(constant.ASYNC_KEY, "false")
diff --git a/examples/dubbo/go-client/profiles/dev/client.yml b/examples/dubbo/go-client/profiles/dev/client.yml
index a845418f883f73bb666692840131337e41ac95b0..5fa71ecec6bf144eae4a4bfc8da242025a3e6246 100644
--- a/examples/dubbo/go-client/profiles/dev/client.yml
+++ b/examples/dubbo/go-client/profiles/dev/client.yml
@@ -8,7 +8,7 @@ pprof_port : 10086
request_timeout : "100ms"
# connect timeout
connect_timeout : "100ms"
-
+check: true
# application config
application_config:
organization : "ikurento.com"
@@ -29,7 +29,7 @@ registries :
- id: "shanghaizk"
type: "zookeeper"
timeout : "3s"
- address: "127.0.0.1:2181"
+ address: "127.0.0.1:2182"
username: ""
password: ""
diff --git a/examples/jsonrpc/go-client/profiles/dev/client.yml b/examples/jsonrpc/go-client/profiles/dev/client.yml
index 03ffb22ab66ea2f058dde903016337dd774a481b..c799727177ff78e9d9cafae6a6ecb0faebed243f 100644
--- a/examples/jsonrpc/go-client/profiles/dev/client.yml
+++ b/examples/jsonrpc/go-client/profiles/dev/client.yml
@@ -3,7 +3,7 @@
# pprof
pprof_enabled : true
pprof_port : 10086
-
+check: true
# client
request_timeout : "3s"
# connect timeout
@@ -29,7 +29,7 @@ registries :
- id: "shanghaizk"
type: "zookeeper"
timeout : "3s"
- address: "127.0.0.1:2181"
+ address: "127.0.0.1:2182"
username: ""
password: ""
diff --git a/registry/directory/directory.go b/registry/directory/directory.go
index fd5a94fd989e4d8fb65ffb09c6cda7954ac05dc5..2c8b49cc47fc44ad0bd80c4ef1a20b6eed9fae3c 100644
--- a/registry/directory/directory.go
+++ b/registry/directory/directory.go
@@ -190,7 +190,16 @@ func (dir *registryDirectory) List(invocation protocol.Invocation) []protocol.In
}
func (dir *registryDirectory) IsAvailable() bool {
- return dir.BaseDirectory.IsAvailable()
+ if !dir.BaseDirectory.IsAvailable() {
+ return dir.BaseDirectory.IsAvailable()
+ } else {
+ for _, ivk := range dir.cacheInvokers {
+ if ivk.IsAvailable() {
+ return true
+ }
+ }
+ }
+ return false
}
func (dir *registryDirectory) Destroy() {
diff --git a/registry/directory/directory_test.go b/registry/directory/directory_test.go
index 1f35462c8949e8ac87a93178267044f61779307f..1dfc16271b6b832bee1433fda21aace59d691fce 100644
--- a/registry/directory/directory_test.go
+++ b/registry/directory/directory_test.go
@@ -77,7 +77,7 @@ func TestSubscribe_Group(t *testing.T) {
assert.Len(t, registryDirectory.cacheInvokers, 2)
}
-func Test_Destory(t *testing.T) {
+func Test_Destroy(t *testing.T) {
registryDirectory, _ := normalRegistryDir()
time.Sleep(1e9)