From 10add9f63af24418a3348c92cc1c1a32793840a5 Mon Sep 17 00:00:00 2001 From: LaurenceLiZhixin <382673304@qq.com> Date: Tue, 15 Jun 2021 18:00:12 +0800 Subject: [PATCH 1/4] Fix: change 3.0 streaming test to reactive --- general/dubbo3/hessian2/go-server/conf/client.yml | 2 +- .../go-server/tests/integration/main_test.go | 2 +- .../server/dubbogo-server/pkg/greeter.go | 11 ++++++----- .../tests/integration/userprovider_test.go | 10 ++++++++-- .../pb/dubbogo-grpc/server/grpcgo-server/main.go | 12 ++++++------ .../stream-client/dubbogo-client/cmd/client.go | 6 +++++- .../dubbogo-grpc/stream-client/grpcgo-client/main.go | 6 ++++-- .../dubbogo-grpc/unary-client/grpcgo-client/main.go | 2 +- go.mod | 4 ++-- go.sum | 9 +++++---- 10 files changed, 39 insertions(+), 25 deletions(-) diff --git a/general/dubbo3/hessian2/go-server/conf/client.yml b/general/dubbo3/hessian2/go-server/conf/client.yml index b9323fe1b..7b8889c54 100644 --- a/general/dubbo3/hessian2/go-server/conf/client.yml +++ b/general/dubbo3/hessian2/go-server/conf/client.yml @@ -29,4 +29,4 @@ references: registry: "demoZk" protocol: "tri" serialization: "hessian2" - interface: "com.apache.dubbo.sample.basic.IGreeter" + interface: "org.apache.dubbo.UserProvider" diff --git a/general/dubbo3/hessian2/go-server/tests/integration/main_test.go b/general/dubbo3/hessian2/go-server/tests/integration/main_test.go index 76fbebb0d..d1f5958b2 100644 --- a/general/dubbo3/hessian2/go-server/tests/integration/main_test.go +++ b/general/dubbo3/hessian2/go-server/tests/integration/main_test.go @@ -65,5 +65,5 @@ func (u *UserProvider) Reference() string { } func (u User) JavaClassName() string { - return "com.apache.dubbo.sample.basic.User" + return "org.apache.dubbo.User" } diff --git a/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/pkg/greeter.go b/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/pkg/greeter.go index 27b09e497..638c2303b 100644 --- a/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/pkg/greeter.go +++ b/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/pkg/greeter.go @@ -52,17 +52,18 @@ func (s *GreeterProvider) SayHelloStream(svr dubbo3.Greeter_SayHelloStreamServer return err } logger.Infof("Dubbo-go3 GreeterProvider recv 2 user, name = %s\n", c2.Name) - c3, err := svr.Recv() - if err != nil { - return err - } - logger.Infof("Dubbo-go3 GreeterProvider recv 3 user, name = %s\n", c3.Name) svr.Send(&dubbo3.User{ Name: "hello " + c.Name, Age: 18, Id: "123456789", }) + c3, err := svr.Recv() + if err != nil { + return err + } + logger.Infof("Dubbo-go3 GreeterProvider recv 3 user, name = %s\n", c3.Name) + svr.Send(&dubbo3.User{ Name: "hello " + c2.Name, Age: 19, diff --git a/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/tests/integration/userprovider_test.go b/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/tests/integration/userprovider_test.go index 6da7d8e4e..e850ca23c 100644 --- a/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/tests/integration/userprovider_test.go +++ b/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/tests/integration/userprovider_test.go @@ -58,7 +58,7 @@ func TestStreamSayHello(t *testing.T){ r, err := greeterProvider.SayHelloStream(ctx) assert.Nil(t, err) - for i := 0; i < 3; i++ { + for i := 0; i < 2; i++ { err := r.Send(&req) assert.Nil(t, err) } @@ -70,6 +70,9 @@ func TestStreamSayHello(t *testing.T){ assert.Equal(t, "123456789",rspUser.Id) assert.Equal(t, int32(18),rspUser.Age) + err = r.Send(&req) + assert.Nil(t, err) + err = r.RecvMsg(rspUser) assert.Nil(t, err) assert.Equal(t, "hello laurence",rspUser.Name) @@ -106,7 +109,7 @@ func TestGRPCClientStreamSayHello(t *testing.T){ } clientStream, err := c.SayHelloStream(context.Background()) assert.Nil(t, err) - for i := 0; i < 3; i++ { + for i := 0; i < 2; i++ { err = clientStream.Send(req) assert.Nil(t, err) } @@ -118,6 +121,9 @@ func TestGRPCClientStreamSayHello(t *testing.T){ assert.Equal(t, "123456789",rspUser.Id) assert.Equal(t, int32(18),rspUser.Age) + err = clientStream.Send(req) + assert.Nil(t, err) + err = clientStream.RecvMsg(rspUser) assert.Nil(t, err) assert.Equal(t, "hello grpc laurence",rspUser.Name) diff --git a/general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go b/general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go index 89f0858b5..f53d8faaf 100644 --- a/general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go +++ b/general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go @@ -24,7 +24,7 @@ import ( ) import ( - "golang.org/x/net/context" + "github.com/dubbogo/net/context" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) @@ -51,17 +51,17 @@ func (s *GreeterProvider) SayHelloStream(svr pb.Greeter_SayHelloStreamServer) er return err } fmt.Printf("grpc GreeterProvider recv 2 user, name = %s\n", c2.Name) - c3, err := svr.Recv() - if err != nil { - return err - } - fmt.Printf("grpc GreeterProvider recv 3 user, name = %s\n", c3.Name) svr.Send(&pb.User{ Name: "hello " + c.Name, Age: 18, Id: "123456789", }) + c3, err := svr.Recv() + if err != nil { + return err + } + fmt.Printf("grpc GreeterProvider recv 3 user, name = %s\n", c3.Name) svr.Send(&pb.User{ Name: "hello " + c2.Name, Age: 19, diff --git a/general/dubbo3/pb/dubbogo-grpc/stream-client/dubbogo-client/cmd/client.go b/general/dubbo3/pb/dubbogo-grpc/stream-client/dubbogo-client/cmd/client.go index 9ea8b4df8..6f0876745 100644 --- a/general/dubbo3/pb/dubbogo-grpc/stream-client/dubbogo-client/cmd/client.go +++ b/general/dubbo3/pb/dubbogo-grpc/stream-client/dubbogo-client/cmd/client.go @@ -66,7 +66,7 @@ func testSayHello() { panic(err) } - for i := 0; i < 3; i++ { + for i := 0; i < 2; i++ { if err := r.Send(&req); err != nil { logger.Errorf("Send SayHelloStream num %d request error = %v\n", i+1, err) return @@ -79,6 +79,10 @@ func testSayHello() { return } logger.Infof("Receive 1 user = %+v\n", rspUser) + if err := r.Send(&req); err != nil { + logger.Errorf("Send SayHelloStream num %d request error = %v\n", 3, err) + return + } rspUser2 := &dubbo3pb.User{} if err := r.RecvMsg(rspUser2); err != nil { logger.Errorf("Receive 2 SayHelloStream response user error = %v\n", err) diff --git a/general/dubbo3/pb/dubbogo-grpc/stream-client/grpcgo-client/main.go b/general/dubbo3/pb/dubbogo-grpc/stream-client/grpcgo-client/main.go index 7e3bb86cd..d34f8b119 100644 --- a/general/dubbo3/pb/dubbogo-grpc/stream-client/grpcgo-client/main.go +++ b/general/dubbo3/pb/dubbogo-grpc/stream-client/grpcgo-client/main.go @@ -22,7 +22,7 @@ import ( "log" ) import ( - "golang.org/x/net/context" + "github.com/dubbogo/net/context" "google.golang.org/grpc" ) @@ -50,7 +50,7 @@ func main() { if err != nil { panic(err) } - for i := 0; i < 3; i++ { + for i := 0; i < 2; i++ { clientStream.Send(BigDataReq) } user1, err := clientStream.Recv() @@ -59,6 +59,8 @@ func main() { } fmt.Printf("get 1 received user = %+v\n", user1) + clientStream.Send(BigDataReq) + user2, err := clientStream.Recv() if err != nil { panic(err) diff --git a/general/dubbo3/pb/dubbogo-grpc/unary-client/grpcgo-client/main.go b/general/dubbo3/pb/dubbogo-grpc/unary-client/grpcgo-client/main.go index e71d351c5..f3132c168 100644 --- a/general/dubbo3/pb/dubbogo-grpc/unary-client/grpcgo-client/main.go +++ b/general/dubbo3/pb/dubbogo-grpc/unary-client/grpcgo-client/main.go @@ -23,7 +23,7 @@ import ( ) import ( - "golang.org/x/net/context" + "github.com/dubbogo/net/context" "google.golang.org/grpc" ) diff --git a/go.mod b/go.mod index 10fa3a54d..d51c2ad78 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,8 @@ require ( github.com/apache/dubbo-go-hessian2 v1.9.2 github.com/bwmarrin/snowflake v0.3.0 github.com/dubbogo/gost v1.11.11 - github.com/dubbogo/triple v1.0.1-0.20210606070217-0815f3a0a013 + github.com/dubbogo/net v0.0.3 + github.com/dubbogo/triple v1.0.1 github.com/emicklei/go-restful/v3 v3.4.0 github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.2.0 // indirect @@ -20,7 +21,6 @@ require ( github.com/transaction-wg/seata-golang v0.2.0 github.com/uber/jaeger-client-go v2.22.1+incompatible github.com/uber/jaeger-lib v2.2.0+incompatible // indirect - golang.org/x/net v0.0.0-20201224014010-6772e930b67b google.golang.org/grpc v1.38.0 google.golang.org/protobuf v1.26.0 ) diff --git a/go.sum b/go.sum index cbd777440..2fd485b24 100644 --- a/go.sum +++ b/go.sum @@ -13,7 +13,6 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -dubbo.apache.org/dubbo-go/v3 v3.0.0-20210613014016-7fedc22e18a6 h1:ysh+TPkgaFzZSE4X3SLpNwFftaiLgJPVYVXgz8HBDGk= dubbo.apache.org/dubbo-go/v3 v3.0.0-20210613014016-7fedc22e18a6/go.mod h1:WH4/erMiZfDo6bXi64Zqg2Zj6QCpOQu6h86Vn7aO/A0= github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= @@ -183,10 +182,12 @@ github.com/dubbogo/gost v1.10.1/go.mod h1:+mQGS51XQEUWZP2JeGZTxJwipjRKtJO7Tr+FOg github.com/dubbogo/gost v1.11.11 h1:u6kY0oJEZEKLCdo9Hz5eAqeDZev2e7+3rJrUkqgC24s= github.com/dubbogo/gost v1.11.11/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= github.com/dubbogo/jsonparser v1.0.1/go.mod h1:tYAtpctvSP/tWw4MeelsowSPgXQRVHHWbqL6ynps8jU= -github.com/dubbogo/net v0.0.2-0.20210326124702-e6a866993192 h1:CBEicrrVwR6u8ty+kL68ItxXVk1jaVYThrsx5ARhxUc= github.com/dubbogo/net v0.0.2-0.20210326124702-e6a866993192/go.mod h1:B6/ka3g8VzcyrmdCH4VkHP1K0aHeI37FmclS+TCwIBU= -github.com/dubbogo/triple v1.0.1-0.20210606070217-0815f3a0a013 h1:0AfyedfDk8rQpilySkJOv+OsgJuoqbOCjqQLgV8vX9U= +github.com/dubbogo/net v0.0.3 h1:2k53mh+1U8h1gFjJ8ykzyP4wNdAdgjc5moD+xVHI/AE= +github.com/dubbogo/net v0.0.3/go.mod h1:B6/ka3g8VzcyrmdCH4VkHP1K0aHeI37FmclS+TCwIBU= github.com/dubbogo/triple v1.0.1-0.20210606070217-0815f3a0a013/go.mod h1:4b2yRUdaE6oRl9c+0SDm1mQ6rU9j21uVz8O85KEBsdo= +github.com/dubbogo/triple v1.0.1 h1:fdBkXTR0I4UBBCDcN+k22uJWU338ZK5mvOPpIBIL5h8= +github.com/dubbogo/triple v1.0.1/go.mod h1:O6vQD2XLCWugzAk0P27HTW4+Uhkd8sjaQn0BZijdGzU= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -940,8 +941,8 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From 9c4c81d70c0c6c2f552499466ab9395efe2efd00 Mon Sep 17 00:00:00 2001 From: LaurenceLiZhixin <382673304@qq.com> Date: Tue, 15 Jun 2021 20:23:01 +0800 Subject: [PATCH 2/4] fix: change nacos version --- configcenter/nacos/go-server/docker/docker-compose.yml | 4 ++-- go.sum | 2 ++ registry/nacos/go-server/docker/docker-compose.yml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configcenter/nacos/go-server/docker/docker-compose.yml b/configcenter/nacos/go-server/docker/docker-compose.yml index 83e131114..e748a8947 100644 --- a/configcenter/nacos/go-server/docker/docker-compose.yml +++ b/configcenter/nacos/go-server/docker/docker-compose.yml @@ -8,10 +8,10 @@ services: restart: on-failure nacos: - image: nacos/nacos-server:latest + image: nacos/nacos-server:1.2.0 container_name: nacos-standalone environment: - PREFER_HOST_MODE=hostname - MODE=standalone ports: - - "8848:8848" \ No newline at end of file + - "8848:8848" diff --git a/go.sum b/go.sum index 2fd485b24..be36c17cd 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,7 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +dubbo.apache.org/dubbo-go/v3 v3.0.0-20210613014016-7fedc22e18a6 h1:ysh+TPkgaFzZSE4X3SLpNwFftaiLgJPVYVXgz8HBDGk= dubbo.apache.org/dubbo-go/v3 v3.0.0-20210613014016-7fedc22e18a6/go.mod h1:WH4/erMiZfDo6bXi64Zqg2Zj6QCpOQu6h86Vn7aO/A0= github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= @@ -943,6 +944,7 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/registry/nacos/go-server/docker/docker-compose.yml b/registry/nacos/go-server/docker/docker-compose.yml index 4b1d3d3bf..16e62ffda 100644 --- a/registry/nacos/go-server/docker/docker-compose.yml +++ b/registry/nacos/go-server/docker/docker-compose.yml @@ -2,10 +2,10 @@ version: "3" services: nacos: - image: nacos/nacos-server:latest + image: nacos/nacos-server:1.2.0 container_name: nacos-standalone environment: - PREFER_HOST_MODE=hostname - MODE=standalone ports: - - "8848:8848" \ No newline at end of file + - "8848:8848" From cf067423869bb1bfb3a8b4805c24a50ec697be8c Mon Sep 17 00:00:00 2001 From: LaurenceLiZhixin <382673304@qq.com> Date: Tue, 15 Jun 2021 20:41:44 +0800 Subject: [PATCH 3/4] fix --- .../go-server/docker/docker-health-check.sh | 3 + .../go-server/docker/docker-health-check.sh | 3 + .../go-server/docker/docker-health-check.sh | 3 + .../nacos/go-server/docker/docker-compose.yml | 2 +- start_integrate_test.sh | 114 +++++++++--------- 5 files changed, 67 insertions(+), 58 deletions(-) create mode 100644 configcenter/nacos/go-server/docker/docker-health-check.sh create mode 100644 multi-registry/go-server/docker/docker-health-check.sh create mode 100644 registry/nacos/go-server/docker/docker-health-check.sh diff --git a/configcenter/nacos/go-server/docker/docker-health-check.sh b/configcenter/nacos/go-server/docker/docker-health-check.sh new file mode 100644 index 000000000..e6b78dc5e --- /dev/null +++ b/configcenter/nacos/go-server/docker/docker-health-check.sh @@ -0,0 +1,3 @@ +sleep 10 +curl http://127.0.0.1:8848/nacos/v1/console/health/liveness +sleep 30 diff --git a/multi-registry/go-server/docker/docker-health-check.sh b/multi-registry/go-server/docker/docker-health-check.sh new file mode 100644 index 000000000..e6b78dc5e --- /dev/null +++ b/multi-registry/go-server/docker/docker-health-check.sh @@ -0,0 +1,3 @@ +sleep 10 +curl http://127.0.0.1:8848/nacos/v1/console/health/liveness +sleep 30 diff --git a/registry/nacos/go-server/docker/docker-health-check.sh b/registry/nacos/go-server/docker/docker-health-check.sh new file mode 100644 index 000000000..e6b78dc5e --- /dev/null +++ b/registry/nacos/go-server/docker/docker-health-check.sh @@ -0,0 +1,3 @@ +sleep 10 +curl http://127.0.0.1:8848/nacos/v1/console/health/liveness +sleep 30 diff --git a/registry/servicediscovery/nacos/go-server/docker/docker-compose.yml b/registry/servicediscovery/nacos/go-server/docker/docker-compose.yml index 6f5aa454e..168ad5fb1 100644 --- a/registry/servicediscovery/nacos/go-server/docker/docker-compose.yml +++ b/registry/servicediscovery/nacos/go-server/docker/docker-compose.yml @@ -11,4 +11,4 @@ services: - "8848:8848" healthcheck: test: "curl --fail http://127.0.0.1:8848/nacos/v1/console/health/liveness || exit 1" - interval: 5s \ No newline at end of file + interval: 5s diff --git a/start_integrate_test.sh b/start_integrate_test.sh index 66ebc0c46..474c8823a 100755 --- a/start_integrate_test.sh +++ b/start_integrate_test.sh @@ -14,65 +14,65 @@ # See the License for the specific language governing permissions and # limitations under the License. -# async -array=("async/go-server") - -# config center -array+=("configcenter/apollo/go-server") -array+=("configcenter/nacos/go-server") -array+=("configcenter/zookeeper/go-server") - -# context -array+=("context/go-server") - -# direct -array+=("direct/go-server") - -# filter -array+=("filter/custom/go-server") -array+=("filter/tpslimit/go-server") -array+=("filter/sentinel/go-server") - -# general-dubbo -array+=("general/dubbo/go-server") - -# general-grpc -array+=("general/grpc/go-server") - -# general-dubbo3(triple) -array+=("general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server") -array+=("general/dubbo3/pb/dubbogo-java/go-server") -array+=("general/dubbo3/hessian2/go-server") -array+=("general/dubbo3/msgpack/go-server") -array+=("general/dubbo3/codec-extension/go-server") - -array+=("generic/go-server") - -# group -array+=("group/go-server-group-a") -array+=("group/go-server-group-b") - -# hello world -array+=("helloworld/go-server") - -# metric -array+=("metric/go-server") - -# multi-registry -# array+=("multi-registry/go-server") - -array+=("registry/zookeeper/go-server") -array+=("registry/etcd/go-server") +## async +#array=("async/go-server") +# +## config center +#array+=("configcenter/apollo/go-server") +#array+=("configcenter/nacos/go-server") +#array+=("configcenter/zookeeper/go-server") +# +## context +#array+=("context/go-server") +# +## direct +#array+=("direct/go-server") +# +## filter +#array+=("filter/custom/go-server") +#array+=("filter/tpslimit/go-server") +#array+=("filter/sentinel/go-server") +# +## general-dubbo +#array+=("general/dubbo/go-server") +# +## general-grpc +#array+=("general/grpc/go-server") +# +## general-dubbo3(triple) +#array+=("general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server") +#array+=("general/dubbo3/pb/dubbogo-java/go-server") +#array+=("general/dubbo3/hessian2/go-server") +#array+=("general/dubbo3/msgpack/go-server") +#array+=("general/dubbo3/codec-extension/go-server") +# +#array+=("generic/go-server") +# +## group +#array+=("group/go-server-group-a") +#array+=("group/go-server-group-b") +# +## hello world +#array+=("helloworld/go-server") +# +## metric +#array+=("metric/go-server") +# +## multi-registry +## array+=("multi-registry/go-server") +# +#array+=("registry/zookeeper/go-server") +#array+=("registry/etcd/go-server") array+=("registry/nacos/go-server") -# registry/servicediscovery/zookeeper -array+=("registry/servicediscovery/zookeeper/go-server") -array+=("registry/servicediscovery/nacos/go-server") - - -# router -array+=("router/uniform-router/file/go-server") -array+=("router/uniform-router/file/go-server2") +## registry/servicediscovery/zookeeper +#array+=("registry/servicediscovery/zookeeper/go-server") +#array+=("registry/servicediscovery/nacos/go-server") +# +# +## router +#array+=("router/uniform-router/file/go-server") +#array+=("router/uniform-router/file/go-server2") for((i=0;i<${#array[*]};i++)) From 518cf170da7ba9a3a9ea9c2e39cf4e301de58c2a Mon Sep 17 00:00:00 2001 From: LaurenceLiZhixin <382673304@qq.com> Date: Tue, 15 Jun 2021 20:49:12 +0800 Subject: [PATCH 4/4] Fix --- start_integrate_test.sh | 114 ++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/start_integrate_test.sh b/start_integrate_test.sh index 474c8823a..66ebc0c46 100755 --- a/start_integrate_test.sh +++ b/start_integrate_test.sh @@ -14,65 +14,65 @@ # See the License for the specific language governing permissions and # limitations under the License. -## async -#array=("async/go-server") -# -## config center -#array+=("configcenter/apollo/go-server") -#array+=("configcenter/nacos/go-server") -#array+=("configcenter/zookeeper/go-server") -# -## context -#array+=("context/go-server") -# -## direct -#array+=("direct/go-server") -# -## filter -#array+=("filter/custom/go-server") -#array+=("filter/tpslimit/go-server") -#array+=("filter/sentinel/go-server") -# -## general-dubbo -#array+=("general/dubbo/go-server") -# -## general-grpc -#array+=("general/grpc/go-server") -# -## general-dubbo3(triple) -#array+=("general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server") -#array+=("general/dubbo3/pb/dubbogo-java/go-server") -#array+=("general/dubbo3/hessian2/go-server") -#array+=("general/dubbo3/msgpack/go-server") -#array+=("general/dubbo3/codec-extension/go-server") -# -#array+=("generic/go-server") -# -## group -#array+=("group/go-server-group-a") -#array+=("group/go-server-group-b") -# -## hello world -#array+=("helloworld/go-server") -# -## metric -#array+=("metric/go-server") -# -## multi-registry -## array+=("multi-registry/go-server") -# -#array+=("registry/zookeeper/go-server") -#array+=("registry/etcd/go-server") +# async +array=("async/go-server") + +# config center +array+=("configcenter/apollo/go-server") +array+=("configcenter/nacos/go-server") +array+=("configcenter/zookeeper/go-server") + +# context +array+=("context/go-server") + +# direct +array+=("direct/go-server") + +# filter +array+=("filter/custom/go-server") +array+=("filter/tpslimit/go-server") +array+=("filter/sentinel/go-server") + +# general-dubbo +array+=("general/dubbo/go-server") + +# general-grpc +array+=("general/grpc/go-server") + +# general-dubbo3(triple) +array+=("general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server") +array+=("general/dubbo3/pb/dubbogo-java/go-server") +array+=("general/dubbo3/hessian2/go-server") +array+=("general/dubbo3/msgpack/go-server") +array+=("general/dubbo3/codec-extension/go-server") + +array+=("generic/go-server") + +# group +array+=("group/go-server-group-a") +array+=("group/go-server-group-b") + +# hello world +array+=("helloworld/go-server") + +# metric +array+=("metric/go-server") + +# multi-registry +# array+=("multi-registry/go-server") + +array+=("registry/zookeeper/go-server") +array+=("registry/etcd/go-server") array+=("registry/nacos/go-server") -## registry/servicediscovery/zookeeper -#array+=("registry/servicediscovery/zookeeper/go-server") -#array+=("registry/servicediscovery/nacos/go-server") -# -# -## router -#array+=("router/uniform-router/file/go-server") -#array+=("router/uniform-router/file/go-server2") +# registry/servicediscovery/zookeeper +array+=("registry/servicediscovery/zookeeper/go-server") +array+=("registry/servicediscovery/nacos/go-server") + + +# router +array+=("router/uniform-router/file/go-server") +array+=("router/uniform-router/file/go-server2") for((i=0;i<${#array[*]};i++))