improve etcd version and change create to put (#1203)

apache · May 16, 2021 · 6b753d5 · 6b753d5
1 parent bda9a0b
commit 6b753d5
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -128,13 +128,11 @@ Finished List:
     * [For grpc](https://github.com/apache/dubbo-go/pull/397)
 
 - Metadata Center
-    * [Nacos](https://github.com/apache/dubbo-go/pull/522)
-    * [Zookeeper](https://github.com/apache/dubbo-go/pull/633)
-    * [Etcd](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/metadata/report/etcd/report.go)
-    * [Consul](https://github.com/apache/dubbo-go/pull/633)
-
-- Service discovery
-    * [Zookeeper](https://github.com/apache/dubbo-go/pull/1161)
+    * [Nacos(Local)](https://github.com/apache/dubbo-go/pull/522)
+    * [Zookeeper(Local)](https://github.com/apache/dubbo-go/pull/633)
+    * [Etcd(Local)](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/metadata/report/etcd/report.go)
+    * [Consul(Local)](https://github.com/apache/dubbo-go/pull/633)
+    * [Zookeeper(Remoting)](https://github.com/apache/dubbo-go/pull/1161)
 
 - Tool
     * [Dubbo-go-cli](https://github.com/apache/dubbo-go/pull/818)

diff --git a/README_CN.md b/README_CN.md
@@ -127,13 +127,11 @@ Apache License, Version 2.0
     * [For grpc](https://github.com/apache/dubbo-go/pull/397)
 
 - 元数据中心
-    * [Nacos](https://github.com/apache/dubbo-go/pull/522)
-    * [Zookeeper](https://github.com/apache/dubbo-go/pull/633)
-    * [Etcd](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/metadata/report/etcd/report.go)
-    * [Consul](https://github.com/apache/dubbo-go/pull/633)
-
-- 服务发现
-    * [Zookeeper](https://github.com/apache/dubbo-go/pull/1161)
+    * [Nacos(Local)](https://github.com/apache/dubbo-go/pull/522)
+    * [Zookeeper(Local)](https://github.com/apache/dubbo-go/pull/633)
+    * [Etcd(Local)](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/metadata/report/etcd/report.go)
+    * [Consul(Local)](https://github.com/apache/dubbo-go/pull/633)
+    * [Zookeeper(Remoting)](https://github.com/apache/dubbo-go/pull/1161)
 
 - 工具箱
     * [Dubbo-go-cli](https://github.com/apache/dubbo-go/pull/818)

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/creasty/defaults v1.5.1
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/dubbogo/go-zookeeper v1.0.3
-	github.com/dubbogo/gost v1.11.8
+	github.com/dubbogo/gost v1.11.9
 	github.com/dubbogo/triple v1.0.0
 	github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.4.0
@@ -51,10 +51,12 @@ require (
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/zouyx/agollo/v3 v3.4.5
-	go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698
+	go.etcd.io/etcd/api/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/client/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/server/v3 v3.5.0-alpha.0
 	go.uber.org/atomic v1.7.0
 	go.uber.org/zap v1.16.0
-	google.golang.org/grpc v1.33.1
+	google.golang.org/grpc v1.36.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.16.9
 	k8s.io/apimachinery v0.16.9

diff --git a/go.sum b/go.sum
diff --git a/metadata/report/etcd/report.go b/metadata/report/etcd/report.go
@@ -66,21 +66,21 @@ func (e *etcdMetadataReport) PublishAppMetadata(metadataIdentifier *identifier.S
 // metadata including the basic info of the server, provider info, and other user custom info
 func (e *etcdMetadataReport) StoreProviderMetadata(providerIdentifier *identifier.MetadataIdentifier, serviceDefinitions string) error {
 	key := e.getNodeKey(providerIdentifier)
-	return e.client.Create(key, serviceDefinitions)
+	return e.client.Put(key, serviceDefinitions)
 }
 
 // StoreConsumerMetadata will store the metadata
 // metadata including the basic info of the server, consumer info, and other user custom info
 func (e *etcdMetadataReport) StoreConsumerMetadata(consumerMetadataIdentifier *identifier.MetadataIdentifier, serviceParameterString string) error {
 	key := e.getNodeKey(consumerMetadataIdentifier)
-	return e.client.Create(key, serviceParameterString)
+	return e.client.Put(key, serviceParameterString)
 }
 
 // SaveServiceMetadata will store the metadata
 // metadata including the basic info of the server, service info, and other user custom info
 func (e *etcdMetadataReport) SaveServiceMetadata(metadataIdentifier *identifier.ServiceMetadataIdentifier, url *common.URL) error {
 	key := e.getNodeKey(metadataIdentifier)
-	return e.client.Create(key, url.String())
+	return e.client.Put(key, url.String())
 }
 
 // RemoveServiceMetadata will remove the service metadata
@@ -105,7 +105,7 @@ func (e *etcdMetadataReport) GetExportedURLs(metadataIdentifier *identifier.Serv
 // SaveSubscribedData will convert the urlList to json array and then store it
 func (e *etcdMetadataReport) SaveSubscribedData(subscriberMetadataIdentifier *identifier.SubscriberMetadataIdentifier, urls string) error {
 	key := e.getNodeKey(subscriberMetadataIdentifier)
-	return e.client.Create(key, urls)
+	return e.client.Put(key, urls)
 }
 
 // GetSubscribedURLs will lookup the url

diff --git a/metadata/report/etcd/report_test.go b/metadata/report/etcd/report_test.go
@@ -26,7 +26,7 @@ import (
 
 import (
 	"github.com/stretchr/testify/assert"
-	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/server/v3/embed"
 )
 
 import (

diff --git a/registry/etcdv3/listener_test.go b/registry/etcdv3/listener_test.go
@@ -26,7 +26,7 @@ import (
 import (
 	"github.com/apache/dubbo-getty"
 	"github.com/stretchr/testify/suite"
-	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/server/v3/embed"
 )
 
 import (

diff --git a/registry/etcdv3/registry.go b/registry/etcdv3/registry.go
@@ -140,7 +140,7 @@ func (r *etcdV3Registry) CreatePath(k string) error {
 	var tmpPath string
 	for _, str := range strings.Split(k, "/")[1:] {
 		tmpPath = path.Join(tmpPath, "/", str)
-		if err := r.client.Create(tmpPath, ""); err != nil {
+		if err := r.client.Put(tmpPath, ""); err != nil {
 			return perrors.WithMessagef(err, "create path %s in etcd", tmpPath)
 		}
 	}

diff --git a/remoting/etcdv3/listener.go b/remoting/etcdv3/listener.go
@@ -25,8 +25,8 @@ import (
 import (
 	gxetcd "github.com/dubbogo/gost/database/kv/etcd/v3"
 	perrors "github.com/pkg/errors"
-	"go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 import (

diff --git a/remoting/etcdv3/listener_test.go b/remoting/etcdv3/listener_test.go
@@ -27,7 +27,7 @@ import (
 import (
 	gxetcd "github.com/dubbogo/gost/database/kv/etcd/v3"
 	"github.com/stretchr/testify/assert"
-	"go.etcd.io/etcd/embed"
+	"go.etcd.io/etcd/server/v3/embed"
 )
 
 import (