diff --git a/common/extension/metadata_service_proxy_factory.go b/common/extension/metadata_service_proxy_factory.go
index e8c9e73d7362a83843f3cb6c52c0f3bd15ab1cc8..83695b027a2d3e935e68fc00f29340557684e079 100644
--- a/common/extension/metadata_service_proxy_factory.go
+++ b/common/extension/metadata_service_proxy_factory.go
@@ -29,8 +29,10 @@ var (
metadataServiceProxyFactoryMap = make(map[string]func() service.MetadataServiceProxyFactory)
)
+type MetadataServiceProxyFactoryFunc func() service.MetadataServiceProxyFactory
+
// SetMetadataServiceProxyFactory store the name-creator pair
-func SetMetadataServiceProxyFactory(name string, creator func() service.MetadataServiceProxyFactory) {
+func SetMetadataServiceProxyFactory(name string, creator MetadataServiceProxyFactoryFunc) {
metadataServiceProxyFactoryMap[name] = creator
}
diff --git a/config/base_config_test.go b/config/base_config_test.go
index 7fa895ad497bace41f3112d83ace22d80c7fc8c4..15b468753ddfd99e77b3d99c0994c0599c649793 100644
--- a/config/base_config_test.go
+++ b/config/base_config_test.go
@@ -116,12 +116,12 @@ func TestRefresh(t *testing.T) {
config.GetEnvInstance().UpdateExternalConfigMap(mockMap)
father := &ConsumerConfig{
- Check: &[]bool{true}[0],
+ Check: &[]bool{true}[0],
BaseConfig: BaseConfig{
- ApplicationConfig:baseAppConfig,
+ ApplicationConfig: baseAppConfig,
},
- Registries: baseRegistries,
- References: baseMockRef,
+ Registries: baseRegistries,
+ References: baseMockRef,
ShutdownConfig: &ShutdownConfig{
Timeout: "12s",
StepTimeout: "2s",
@@ -150,12 +150,12 @@ func TestAppExternalRefresh(t *testing.T) {
mockMap["dubbo.consumer.check"] = "true"
config.GetEnvInstance().UpdateExternalConfigMap(mockMap)
father := &ConsumerConfig{
- Check: &[]bool{true}[0],
+ Check: &[]bool{true}[0],
BaseConfig: BaseConfig{
- ApplicationConfig:baseAppConfig,
+ ApplicationConfig: baseAppConfig,
},
- Registries: baseRegistries,
- References: baseMockRef,
+ Registries: baseRegistries,
+ References: baseMockRef,
}
c.SetFatherConfig(father)
@@ -178,12 +178,12 @@ func TestAppExternalWithoutIDRefresh(t *testing.T) {
mockMap["dubbo.consumer.check"] = "true"
config.GetEnvInstance().UpdateExternalConfigMap(mockMap)
father := &ConsumerConfig{
- Check: &[]bool{true}[0],
+ Check: &[]bool{true}[0],
BaseConfig: BaseConfig{
- ApplicationConfig:baseAppConfig,
+ ApplicationConfig: baseAppConfig,
},
- Registries: baseRegistries,
- References: baseMockRef,
+ Registries: baseRegistries,
+ References: baseMockRef,
}
c.SetFatherConfig(father)
@@ -208,13 +208,13 @@ func TestRefreshSingleRegistry(t *testing.T) {
config.GetEnvInstance().UpdateExternalConfigMap(mockMap)
father := &ConsumerConfig{
- Check: &[]bool{true}[0],
+ Check: &[]bool{true}[0],
BaseConfig: BaseConfig{
- ApplicationConfig: baseAppConfig,
+ ApplicationConfig: baseAppConfig,
},
- Registries: map[string]*RegistryConfig{},
- Registry: &RegistryConfig{},
- References: baseMockRef,
+ Registries: map[string]*RegistryConfig{},
+ Registry: &RegistryConfig{},
+ References: baseMockRef,
}
c.SetFatherConfig(father)
@@ -242,7 +242,7 @@ func TestRefreshProvider(t *testing.T) {
BaseConfig: BaseConfig{
ApplicationConfig: baseAppConfig,
},
- Registries: baseRegistries,
+ Registries: baseRegistries,
Services: map[string]*ServiceConfig{
"MockService": {
InterfaceName: "com.MockService",
diff --git a/config/config_loader.go b/config/config_loader.go
index d5f8c68c1bf35c40c09d7d15bae4b6b9f161e9e7..b9195aec3fb6e04357b280013fdf2d25ae9cddea 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -148,9 +148,9 @@ func loadConsumerConfig() {
checkok = false
count++
if count > maxWait {
- errMsg := 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, constant.Version)
- logger.Error(errMsg)
- panic(errMsg)
+ // errMsg := 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, constant.Version)
+ // logger.Error(errMsg)
+ // panic(errMsg)
}
time.Sleep(time.Second * 1)
break
diff --git a/registry/etcdv3/service_discovery.go b/registry/etcdv3/service_discovery.go
index 5699f1c427f9807ed4c6d179a18a996ea71623bb..10396049fb6bb7a5a5935ce21639dc5a78a56b0b 100644
--- a/registry/etcdv3/service_discovery.go
+++ b/registry/etcdv3/service_discovery.go
@@ -158,7 +158,7 @@ func (e *etcdV3ServiceDiscovery) GetInstances(serviceName string) []registry.Ser
}
return serviceInstances
}
- perrors.New(fmt.Sprintf("could not getChildrenKVList the err is:%v", err))
+ logger.Infof("could not getChildrenKVList the err is:%v", err)
}
return make([]registry.ServiceInstance, 0, 0)
diff --git a/registry/event/event_publishing_service_deiscovery_test.go b/registry/event/event_publishing_service_deiscovery_test.go
index 8020702080f5158d6ba97ebb3077d86ff130d4e2..54752c03c0de598226270b27c8d7d0f3621d07d1 100644
--- a/registry/event/event_publishing_service_deiscovery_test.go
+++ b/registry/event/event_publishing_service_deiscovery_test.go
@@ -20,8 +20,6 @@ package event
import (
"reflect"
"testing"
-
- "github.com/apache/dubbo-go/metadata/mapping"
)
import (
@@ -36,6 +34,7 @@ import (
"github.com/apache/dubbo-go/common/observer"
dispatcher2 "github.com/apache/dubbo-go/common/observer/dispatcher"
"github.com/apache/dubbo-go/config"
+ "github.com/apache/dubbo-go/metadata/mapping"
_ "github.com/apache/dubbo-go/metadata/service/inmemory"
"github.com/apache/dubbo-go/registry"
)
diff --git a/registry/zookeeper/service_discovery.go b/registry/zookeeper/service_discovery.go
index aff92049aa5a46b93cc94387ec1f6771ad574812..cf2016c3611752dca44ff51c1cf9471094f36693 100644
--- a/registry/zookeeper/service_discovery.go
+++ b/registry/zookeeper/service_discovery.go
@@ -300,6 +300,7 @@ func (zksd *zookeeperServiceDiscovery) DataChange(eventType remoting.Event) bool
err := zksd.DispatchEventByServiceName(serviceName)
if err != nil {
logger.Errorf("[zkServiceDiscovery] DispatchEventByServiceName{%s} error = err{%v}", serviceName, err)
+ return false
}
return true
}
diff --git a/registry/zookeeper/service_discovery_test.go b/registry/zookeeper/service_discovery_test.go
index 66494078000ac384977354ed925968c4b803bea8..ea3c7ddd48adc0adc4162d8306d28283575f694a 100644
--- a/registry/zookeeper/service_discovery_test.go
+++ b/registry/zookeeper/service_discovery_test.go
@@ -18,8 +18,6 @@
package zookeeper
import (
- "github.com/apache/dubbo-go/common/extension"
- "github.com/apache/dubbo-go/common/observer"
"strconv"
"sync"
"testing"
@@ -31,6 +29,8 @@ import (
)
import (
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/observer"
"github.com/apache/dubbo-go/config"
"github.com/apache/dubbo-go/registry"
)
diff --git a/remoting/consul/test_agent.go b/remoting/consul/test_agent.go
index fd0694bde37b84cd59eed29e0c2ee3136f4ef51b..1744da7bd9992ae3cd376b22e9ea3a135dce2b16 100644
--- a/remoting/consul/test_agent.go
+++ b/remoting/consul/test_agent.go
@@ -60,11 +60,5 @@ func (consulAgent *ConsulAgent) Close() error {
if err != nil {
return err
}
-
- err = os.RemoveAll(consulAgent.dataDir)
- if err != nil {
- return err
- }
-
- return nil
+ return os.RemoveAll(consulAgent.dataDir)
}
diff --git a/remoting/zookeeper/client.go b/remoting/zookeeper/client.go
index a24e9eb828c0971b7046b6f4d1774aef030d8e7d..d574fbcd2055f2f7f833990c89d98b86c6f42dac 100644
--- a/remoting/zookeeper/client.go
+++ b/remoting/zookeeper/client.go
@@ -156,7 +156,7 @@ func ValidateZookeeperClient(container ZkClientFacade, opts ...Option) error {
}
if connected {
- logger.Info("Connect to zookeeper successfully, name{%s}, zk address{%v}", options.zkName, url.Location)
+ logger.Infof("Connect to zookeeper successfully, name{%s}, zk address{%v}", options.zkName, url.Location)
container.WaitGroup().Add(1) // zk client start successful, then registry wg +1
}
@@ -433,6 +433,7 @@ func (z *ZookeeperClient) CreateWithValue(basePath string, value []byte) error {
// CreateTempWithValue will create the node recursively, which means that if the parent node is absent,
// it will create parent node first，and set value in last child path
+// If the path exist, it will update data
func (z *ZookeeperClient) CreateTempWithValue(basePath string, value []byte) error {
var (
err error
@@ -453,6 +454,9 @@ func (z *ZookeeperClient) CreateTempWithValue(basePath string, value []byte) err
// last child need be ephemeral
if i == length-1 {
_, err = conn.Create(tmpPath, value, zk.FlagEphemeral, zk.WorldACL(zk.PermAll))
+ if err == zk.ErrNodeExists {
+ return err
+ }
} else {
_, err = conn.Create(tmpPath, []byte{}, 0, zk.WorldACL(zk.PermAll))
}
diff --git a/remoting/zookeeper/curator_discovery/service_discovery.go b/remoting/zookeeper/curator_discovery/service_discovery.go
index 6c7ec15e9ae208540179419fc68420f24a15eb46..1b52a53d80a35a67cff463b275628588768a6085 100644
--- a/remoting/zookeeper/curator_discovery/service_discovery.go
+++ b/remoting/zookeeper/curator_discovery/service_discovery.go
@@ -22,6 +22,8 @@ import (
"path"
"strings"
"sync"
+
+ "github.com/dubbogo/go-zookeeper/zk"
)
import (
@@ -71,6 +73,16 @@ func (sd *ServiceDiscovery) registerService(instance *ServiceInstance) error {
return err
}
err = sd.client.CreateTempWithValue(path, data)
+ if err == zk.ErrNodeExists {
+ _, state, _ := sd.client.GetContent(path)
+ if state != nil {
+ _, err = sd.client.SetContent(path, data, state.Version+1)
+ if err != nil {
+ logger.Debugf("Try to update the node data failed. In most cases, it's not a problem. ")
+ }
+ }
+ return nil
+ }
if err != nil {
return err
}
diff --git a/remoting/zookeeper/facade.go b/remoting/zookeeper/facade.go
index ac0c5e80e0181f42f2de10cb07a0e4ca092d9347..d5d9e6e74858e3ec520aedee5b8ba059baf928d8 100644
--- a/remoting/zookeeper/facade.go
+++ b/remoting/zookeeper/facade.go
@@ -18,7 +18,6 @@
package zookeeper
import (
- "github.com/apache/dubbo-go/common"
"sync"
)
import (
@@ -27,6 +26,7 @@ import (
)
import (
+ "github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/logger"
)
@@ -34,8 +34,8 @@ type ZkClientFacade interface {
ZkClient() *ZookeeperClient
SetZkClient(*ZookeeperClient)
ZkClientLock() *sync.Mutex
- WaitGroup() *sync.WaitGroup //for wait group control, zk client listener & zk client container
- Done() chan struct{} //for zk client control
+ WaitGroup() *sync.WaitGroup // for wait group control, zk client listener & zk client container
+ Done() chan struct{} // for zk client control
RestartCallBack() bool
GetUrl() common.URL
}