Istio/XDS support #1804

LaurenceLiZhixin · 2022-03-31T14:36:29Z

What this PR does:

Added Istio/XDS support

Added isTIod-based service discovery
Added XDS circuit breaker
Added basic isTIO-RDS routing rules and traffic governance capabilities

We Refered xdsClient impl of gRPC, and retained copy right of gRPC developers.

增加了Istio/XDS 支持

增加了基于istiod 的服务发现
增加了xds circuit breaker
增加了基本的适配于 istio-rds 的路由规则和流量治理能力

我们引用了gRPC的xdsClient impl，并保留了gRPC开发者的版权。

Which issue(s) this PR fixes:
Fixes #1803

To Developers

Developers are recommended to use xds feature with dubbogo-cli, which would be release soon.
Samples and more add-on features of sevice mesh ecology are welcomend for contributers.

You should pay attention to items below to ensure your pr passes our ci test
We do not merge pr with ci tests failed

All ut passed (run 'go test ./...' in project root)
After go-fmt ed , run 'go fmt project' using goland.
Golangci-lint passed, run 'sudo golangci-lint run' in project root.
After import formatted, (using imports-formatter to run 'imports-formatter .' in project root, to format your import blocks, mentioned in CONTRIBUTING.md above)
Your new-created file needs to have apache license at the top, like other existed file does.
All integration test passed. You can run integration test locally (with docker env). Clone our dubbo-go-samples project and replace the go.mod to your dubbo-go, and run 'sudo sh start_integration_test.sh' at root of samples project root. (M1 Slice is not Support)

xds circuit breaker max request

* fix: ut * Fix: add license

xds/balancer/loadstore/load_store_wrapper.go

zhaoyunxing92 · 2022-04-01T02:37:50Z

.github/workflows/github-actions.yml

@@ -14,7 +14,7 @@ jobs:
      # If you want to matrix build , you can append the following list.
      matrix:
        go_version:
-          - 1.15
+          - 1.17


我们要升级这个版本吗

我认为升级吧。
1.15 版本不支持一些基础函数，比如os.ReadFile
开发者本地如果使用高版本，ci的时候会报错
@zhaoyunxing92

As we discussed yesterday night, pls recover the go version.

codecov-commenter · 2022-04-01T06:16:31Z

Codecov Report

Merging #1804 (e41ea18) into 3.0 (c12c1d6) will decrease coverage by 0.40%.
The diff coverage is 34.85%.

❗ Current head e41ea18 differs from pull request most recent head 53a86dd. Consider uploading reports for the commit 53a86dd to get more accurate results

@@            Coverage Diff             @@
##              3.0    #1804      +/-   ##
==========================================
- Coverage   47.17%   46.76%   -0.41%     
==========================================
  Files         298      298              
  Lines       17401    17157     -244     
==========================================
- Hits         8209     8024     -185     
+ Misses       8339     8288      -51     
+ Partials      853      845       -8

Impacted Files	Coverage Δ
common/url.go	`59.31% <0.00%> (-1.36%)`	⬇️
protocol/dubbo3/dubbo3_invoker.go	`55.65% <ø> (+0.47%)`	⬆️
protocol/invocation/rpcinvocation.go	`12.92% <0.00%> (-2.87%)`	⬇️
remoting/xds/xds_client_factory.go	`0.00% <0.00%> (ø)`
xds/balancer/clusterimpl/logging.go	`0.00% <0.00%> (ø)`
xds/balancer/clusterimpl/picker.go	`0.00% <0.00%> (ø)`
xds/balancer/priority/balancer_child.go	`0.00% <0.00%> (ø)`
xds/balancer/priority/balancer_priority.go	`0.00% <0.00%> (ø)`
xds/balancer/priority/ignore_resolve_now.go	`0.00% <0.00%> (ø)`
xds/balancer/priority/logging.go	`0.00% <0.00%> (ø)`
... and 42 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c12c1d6...53a86dd. Read the comment docs.

AlexStocks · 2022-04-02T04:46:39Z

cluster/router/meshrouter/meshrouter.go

+				ctx := invocation.ToContext()
+				matcher, err := resource.RouteToMatcher(r)
+				if err != nil {
+					panic(err)


panic 不能随便用，这里确实有必要使用 panic 吗？

AlexStocks · 2022-04-02T04:47:50Z

go.mod

@@ -1,6 +1,6 @@
 module dubbo.apache.org/dubbo-go/v3

-go 1.15
+go 1.17


欢迎 go 版本。

AlexStocks · 2022-04-02T04:48:18Z

go.mod

 	google.golang.org/grpc v1.45.0
 	google.golang.org/protobuf v1.28.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/apimachinery v0.22.4
 	k8s.io/client-go v0.16.9
 )
+
+require (


加这么多 require 块作甚？

合并成一个吧。

这个是go 1.17的特性，切回去go版本就好了。

AlexStocks · 2022-04-02T04:49:17Z

protocol/invocation.go

@@ -57,4 +58,6 @@ type Invocation interface {
 	SetAttribute(key string, value interface{})
 	GetAttribute(key string) (interface{}, bool)
 	GetAttributeWithDefaultValue(key string, defaultValue interface{}) interface{}
+
+	ToContext() context.Context


GetContext() may be better?

I changed to 'GetAttachmentAsContext', which is more clear.

AlexStocks · 2022-04-02T04:51:17Z

registry/xds/registry.go

+}
+
+func isProvider(url *common.URL) bool {
+	return getCategory(url) == "providers"


"providers" 在如下地方有定义：
./common/constant/default.go:77: ProviderCategory = "providers"

不要在这里直接使用字符串。

AlexStocks · 2022-04-02T04:52:37Z

remoting/xds/common/model.go

+	"strings"
+)
+
+type Addr struct {


我反对你重新封装这么一个 struct， net.Addr 不能用吗？

官方库的net.Addr只是一个接口，并不是具体类型。
第三房库也有类似的实现，我认为不如自己定义一个用的方便和清晰。 @AlexStocks

1 继承 Addr 接口
2 看是否有必要放入 common

AlexStocks · 2022-04-02T04:53:02Z

remoting/xds/common/model.go

+	Port         string
+}
+
+func NewAddr(addr string) Addr {


net. 包内部有 net.SplitHostPort

AlexStocks · 2022-04-02T04:53:37Z

remoting/xds/common/model.go

+	}
+}
+
+func (a *Addr) String() string {


net 包内部有 net.JoinHostPort

从上面分析来看，你没必要封装这么一个东西。

我认为还是需要封装一个自己的Addr，用来以字符串形式存储“地址 + 端口”
官方提供的net.TCPAddr，其ip必须是真实的ip，并不是字符串封装的地址例如"istiod.istio-system.svc.cluster.local"，不能在我的场景使用。
上面几个评论，使用官方库来进行地址和ip+port的转换，这个我会修复。
但我还是希望保留这个Addr 对象。 @AlexStocks

那你把名字清晰化，譬如取名 IstioXDSAddr 之类的

AlexStocks · 2022-04-02T04:55:56Z

remoting/xds/interfaceMapping/debug.go

+ * limitations under the License.
+ */
+
+package interfaceMapping


interfaceMapping 这个 package name 是从 xds 里面搞过来的吗？如果不是，直接改用 mapping 就可以了。

AlexStocks · 2022-04-02T04:56:30Z

remoting/xds/interfaceMapping/handler.go

+func (i *InterfaceMapHandlerImpl) GetHostAddrMap(serviceUniqueKey string) (string, error) {
+	i.interfaceNameHostAddrMapLock.RLock()
+	if hostAddr, ok := i.interfaceNameHostAddrMap[serviceUniqueKey]; ok {
+		return hostAddr, nil


OMG，deadlock

AlexStocks · 2022-04-04T08:22:39Z

protocol/invocation/rpcinvocation.go

+		if str, ok := v.([]string); ok {
+			gRPCMD.Set(k, str...)
+			continue
+		}


这里如果是其他类型，是不是得几个错误 log？

AlexStocks · 2022-04-04T08:23:05Z

registry/directory/directory.go

@@ -312,9 +314,28 @@ func (dir *RegistryDirectory) toGroupInvokers() []protocol.Invoker {
 	return groupInvokersList
 }

+func (dir *RegistryDirectory) uncacheInvokerWithClusterId(clusterId string) []protocol.Invoker {


ClusterId --> ClusterID

函数名称和变量名称都改下

AlexStocks · 2022-04-04T08:36:57Z

xds/balancer/clusterresolver/resource_resolver.go

+ *
+ */
+
+package clusterresolver


clusterresolver 这里的 package 和路径名字改为 resolver 如何？

Codes in xds/* are refered form grpc @AlexStocks

AlexStocks · 2022-04-04T08:40:23Z

xds/balancer/priority/ignore_resolve_now.go

+
+	"google.golang.org/grpc/resolver"
+)
+


下面这个 struct 还有本文件名称命名很奇怪，Resolve 是个动词。文件名称里面带有 now，这很奇怪。你是要表达什么意思？详细说下，我给你换个名字。

zhshw and others added 15 commits March 14, 2022 14:17

init xds client, balancer from grpc

6937c5f

xds server from grpc

193d021

xds csds from grpc

6dd55e7

xds bootstrap from grpc

ad7a530

Fix: init test client

339db08

Fix: init xds registry

24ae453

Fix: init xds registry

c8aed72

Ftr: xds registry support

226d8a9

Fix: conflict

2a1ec24

fix: support router

55374e7

add comments

c73695f

Fix: delete unused file

9838ce9

i This is a combination of 2 commits.

c24faa0

xds circuit breaker max request

Enhancement XDS ut. (#7)

227b4ab

* fix: ut * Fix: add license

Fix: merge 3.0

67f6ed0

AlexStocks reviewed Mar 31, 2022

View reviewed changes

xds/balancer/loadstore/load_store_wrapper.go Outdated Show resolved Hide resolved

zhaoyunxing92 reviewed Apr 1, 2022

View reviewed changes

fix: grpc copyright

eb7230a

AlexStocks reviewed Apr 2, 2022

View reviewed changes

go.mod Outdated

@@ -1,6 +1,6 @@

module dubbo.apache.org/dubbo-go/v3

go 1.15

go 1.17

Copy link

Contributor

AlexStocks Apr 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

欢迎 go 版本。

AlexStocks reviewed Apr 2, 2022

View reviewed changes

remoting/xds/common/model.go Outdated

Port string

}

func NewAddr(addr string) Addr {

Copy link

Contributor

AlexStocks Apr 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

net. 包内部有 net.SplitHostPort

AlexStocks reviewed Apr 2, 2022

View reviewed changes

fix: xds comments

8602128

Fix: compatiable to go 1.15

aba60ca

AlexStocks reviewed Apr 4, 2022

View reviewed changes

fix: change cluster Id to ID

e41ea18

AlexStocks reviewed Apr 4, 2022

View reviewed changes

LaurenceLiZhixin added 2 commits April 5, 2022 15:25

fix: rename to host addr

53a86dd

Fix: import formatter

abd851a

AlexStocks approved these changes Apr 5, 2022

View reviewed changes

zhaoyunxing92 approved these changes Apr 6, 2022

View reviewed changes

zhaoyunxing92 merged commit b84027f into apache:3.0 Apr 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Istio/XDS support #1804

Istio/XDS support #1804

LaurenceLiZhixin commented Mar 31, 2022 •

edited

Loading

zhaoyunxing92 Apr 1, 2022

LaurenceLiZhixin Apr 1, 2022

zhaoyunxing92 Apr 1, 2022

AlexStocks Apr 2, 2022

codecov-commenter commented Apr 1, 2022 •

edited

Loading

AlexStocks Apr 2, 2022

AlexStocks Apr 2, 2022

AlexStocks Apr 2, 2022

AlexStocks Apr 2, 2022

LaurenceLiZhixin Apr 2, 2022

AlexStocks Apr 2, 2022

LaurenceLiZhixin Apr 4, 2022

AlexStocks Apr 2, 2022

LaurenceLiZhixin Apr 4, 2022

AlexStocks Apr 2, 2022

LaurenceLiZhixin Apr 4, 2022

AlexStocks Apr 5, 2022

AlexStocks Apr 2, 2022

AlexStocks Apr 2, 2022

LaurenceLiZhixin Apr 4, 2022

AlexStocks Apr 4, 2022

AlexStocks Apr 2, 2022

LaurenceLiZhixin Apr 4, 2022

AlexStocks Apr 2, 2022

AlexStocks Apr 4, 2022

AlexStocks Apr 4, 2022

AlexStocks Apr 4, 2022

AlexStocks Apr 4, 2022

LaurenceLiZhixin Apr 4, 2022

AlexStocks Apr 4, 2022

Istio/XDS support #1804

Istio/XDS support #1804

Conversation

LaurenceLiZhixin commented Mar 31, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-commenter commented Apr 1, 2022 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LaurenceLiZhixin commented Mar 31, 2022 •

edited

Loading

codecov-commenter commented Apr 1, 2022 •

edited

Loading