Fix: change 3.0 streaming test and samples to reactive (apache#140)

* Fix: change 3.0 streaming test to reactive * fix: change nacos version * fix * Fix
LaurenceLiZhixin · Jun 15, 2021 · 86137ea · 86137ea
1 parent defcc32
commit 86137ea
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 28 deletions.
diff --git 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"
+      - "8848:8848"
diff --git a/configcenter/nacos/go-server/docker/docker-health-check.sh 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -183,10 +183,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,6 +942,7 @@ 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=

diff --git a/multi-registry/go-server/docker/docker-health-check.sh 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-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"
+      - "8848:8848"
diff --git a/registry/nacos/go-server/docker/docker-health-check.sh 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
@@ -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
+      interval: 5s