update

Author: chenjie199234

cgrpc/balancer.go

@@ -208,6 +208,10 @@ func (b *corelibBalancer) Pick(info balancer.PickInfo) (balancer.PickResult, err
 	for {
 		server := b.c.c.Picker(b.getPickServers())
 		if server != nil {
+			if dl, ok := info.Ctx.Deadline(); ok && dl.UnixNano() <= time.Now().UnixNano()+int64(5*time.Millisecond) {
+				//at least 5ms for net lag and server logic
+				return balancer.PickResult{}, cerror.ErrDeadlineExceeded
+			}
 			atomic.AddInt32(&server.Pickinfo.Activecalls, 1)
 			return balancer.PickResult{
 				SubConn: server.subconn,

cgrpc/client.go

@@ -189,7 +189,6 @@ func (c *CGrpcClient) Call(ctx context.Context, path string, req interface{}, re
 		ctx, cancel = context.WithDeadline(ctx, time.Now().Add(c.c.GlobalTimeout))
 		defer cancel()
 	}
-	dl, ok := ctx.Deadline()
 	md := gmetadata.New(nil)
 	if len(metadata) != 0 {
 		d, _ := json.Marshal(metadata)
@@ -203,10 +202,6 @@ func (c *CGrpcClient) Call(ctx context.Context, path string, req interface{}, re
 	ctx = gmetadata.NewOutgoingContext(ctx, md)
 	for {
 		start := time.Now()
-		if ok && dl.UnixNano() <= start.UnixNano()+int64(5*time.Millisecond) {
-			//at least 5ms for net lag and server logic
-			return cerror.ErrDeadlineExceeded
-		}
 		p := &peer.Peer{}
 		e := transGrpcError(c.conn.Invoke(ctx, path, req, resp, grpc.Peer(p)))
 		end := time.Now()

codegen/tml/gomod/template_gomod.go

@@ -11,12 +11,12 @@ const text = `module {{.}}
 go 1.17
 
 require (
-	github.com/chenjie199234/Config v0.0.26
-	github.com/chenjie199234/Corelib v0.0.40
+	github.com/chenjie199234/Config v0.0.27
+	github.com/chenjie199234/Corelib v0.0.41
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/segmentio/kafka-go v0.4.25
-	go.mongodb.org/mongo-driver v1.8.1
+	go.mongodb.org/mongo-driver v1.8.2
 	google.golang.org/protobuf v1.27.1
 )`
 

crpc/client.go

@@ -265,14 +265,14 @@ func (c *CrpcClient) Call(ctx context.Context, path string, in []byte, metadata
 	r := c.getreq(msg)
 	for {
 		start := time.Now()
-		if ok && dl.UnixNano() <= start.UnixNano()+int64(5*time.Millisecond) {
-			//at least 5ms for net lag and server logic
-			return nil, cerror.ErrDeadlineExceeded
-		}
 		server, e := c.balancer.Pick(ctx)
 		if e != nil {
 			return nil, e
 		}
+		if ok && dl.UnixNano() <= time.Now().UnixNano()+int64(5*time.Millisecond) {
+			//at least 5ms for net lag and server logic
+			return nil, cerror.ErrDeadlineExceeded
+		}
 		msg.Callid = atomic.AddUint64(&server.callid, 1)
 		atomic.AddInt32(&server.Pickinfo.Activecalls, 1)
 		if e = server.sendmessage(ctx, r); e != nil {

web/client.go

@@ -10,7 +10,6 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"net/textproto"
 	"net/url"
 	"os"
 	"strconv"
@@ -132,16 +131,16 @@ func NewWebClient(c *ClientConfig, selfgroup, selfname, servergroup, servername
 }
 
 func forbiddenHeader(header http.Header) bool {
-	if _, ok := header[textproto.CanonicalMIMEHeaderKey("core_target")]; ok {
+	if _, ok := header["Core_target"]; ok {
 		return true
 	}
-	if _, ok := header[textproto.CanonicalMIMEHeaderKey("core_deadline")]; ok {
+	if _, ok := header["Core_deadline"]; ok {
 		return true
 	}
-	if _, ok := header[textproto.CanonicalMIMEHeaderKey("core_metadata")]; ok {
+	if _, ok := header["Core_metadata"]; ok {
 		return true
 	}
-	if _, ok := header[textproto.CanonicalMIMEHeaderKey("core_tracedata")]; ok {
+	if _, ok := header["Core_tracedata"]; ok {
 		return true
 	}
 	return false
@@ -247,8 +246,7 @@ func (this *WebClient) call(method string, ctx context.Context, path, query stri
 		}
 		req.Header = header
 		//start call
-		var resp *http.Response
-		resp, e = this.httpclient.Do(req)
+		resp, e := this.httpclient.Do(req)
 		end := time.Now()
 		if e != nil {
 			e = cerror.ConvertStdError(e)