From d4fea1cad967ec7c377303407bc11d28a9c58193 Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Wed, 13 Jul 2022 11:16:20 +0800
Subject: [PATCH] add retry interceptor in test

---
 client/workflow/workflow.go | 14 --------------
 test/busi/base_grpc.go      | 29 ++++++++++++++++-------------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/client/workflow/workflow.go b/client/workflow/workflow.go
index ae40922..8075536 100644
--- a/client/workflow/workflow.go
+++ b/client/workflow/workflow.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"log"
 	"net/http"
 	"net/url"
 
@@ -15,8 +14,6 @@ import (
 	"github.com/dtm-labs/dtm/client/workflow/wfpb"
 	"github.com/go-resty/resty/v2"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 // InitHTTP will init Workflow engine to use http
@@ -216,17 +213,6 @@ func Interceptor(ctx context.Context, method string, req, reply interface{}, cc
 	origin := func() error {
 		ctx1 := dtmgimp.TransInfo2Ctx(ctx, wf.Gid, wf.TransType, wf.currentBranch, wf.currentOp, wf.Dtm)
 		err := invoker(ctx1, method, req, reply, cc, opts...)
-		if err != nil {
-			logger.Errorf("grpc client called: %s%s %s result: %s err: %v",
-				cc.Target(), method, dtmimp.MustMarshalString(req), dtmimp.MustMarshalString(reply), err)
-			st, _ := status.FromError(err)
-			if st != nil && st.Code() == codes.Unavailable {
-				err = invoker(ctx1, method, req, reply, cc, opts...)
-				if err == nil {
-					log.Fatalf("after manually retry, err == nil")
-				}
-			}
-		}
 		res := fmt.Sprintf("grpc client called: %s%s %s result: %s err: %v",
 			cc.Target(), method, dtmimp.MustMarshalString(req), dtmimp.MustMarshalString(reply), err)
 		if err != nil {
diff --git a/test/busi/base_grpc.go b/test/busi/base_grpc.go
index 511f3cd..5d0e2f6 100644
--- a/test/busi/base_grpc.go
+++ b/test/busi/base_grpc.go
@@ -12,6 +12,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"time"
 
 	"github.com/dtm-labs/dtm/client/dtmcli"
 	"github.com/dtm-labs/dtm/client/dtmcli/dtmimp"
@@ -23,7 +24,9 @@ import (
 	"github.com/dtm-labs/dtm/client/dtmgrpc/dtmgpb"
 	"github.com/dtm-labs/dtm/client/workflow"
 	grpc "google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
+	status "google.golang.org/grpc/status"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
@@ -36,25 +39,25 @@ var DtmClient dtmgpb.DtmClient
 // BusiCli grpc client for busi
 var BusiCli BusiClient
 
+func retry(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
+	logger.Debugf("in retry interceptor")
+	err := invoker(ctx, method, req, reply, cc, opts...)
+	if st, _ := status.FromError(err); st != nil && st.Code() == codes.Unavailable {
+		time.Sleep(10 * time.Millisecond)
+		logger.Errorf("invoker return err: %v", err)
+		err = invoker(ctx, method, req, reply, cc, opts...)
+	}
+	return err
+}
+
 // GrpcStartup for grpc
 func GrpcStartup() *grpc.Server {
 	conn, err := grpc.Dial(dtmutil.DefaultGrpcServer, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithUnaryInterceptor(dtmgimp.GrpcClientLog))
 	logger.FatalIfError(err)
 	DtmClient = dtmgpb.NewDtmClient(conn)
 	logger.Debugf("dtm client inited")
-	retryPolicy := `{
-		"methodConfig": [{
-				"waitForReady": true,
-				"retryPolicy": {
-						"MaxAttempts": 2,
-						"InitialBackoff": ".01s",
-						"MaxBackoff": ".01s",
-						"BackoffMultiplier": 1.0,
-						"RetryableStatusCodes": [ "UNAVAILABLE" ]
-				}
-		}]
-}`
-	conn1, err := grpc.Dial(BusiGrpc, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithUnaryInterceptor(workflow.Interceptor), grpc.WithDefaultServiceConfig(retryPolicy))
+	// in github actions, the call is failed sometime, so add a retry
+	conn1, err := grpc.Dial(BusiGrpc, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithChainUnaryInterceptor(workflow.Interceptor, retry))
 	logger.FatalIfError(err)
 	BusiCli = NewBusiClient(conn1)