Unify timeout unit to millisecond in dubbo protocol (#2737)

apache · Oct 14, 2024 · d1fe72b · d1fe72b
1 parent a6cf7ae
commit d1fe72b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/common/constant/key.go b/common/constant/key.go
@@ -47,7 +47,7 @@ const (
 	TokenKey               = "token"
 	LocalAddr              = "local-addr"
 	RemoteAddr             = "remote-addr"
-	DefaultRemotingTimeout = 3000
+	DefaultRemotingTimeout = 1000
 	ReleaseKey             = "release"
 	AnyhostKey             = "anyhost"
 	PortKey                = "port"

diff --git a/protocol/dubbo/dubbo_codec.go b/protocol/dubbo/dubbo_codec.go
@@ -19,6 +19,7 @@ package dubbo
 
 import (
 	"bytes"
+	"strconv"
 	"time"
 )
 
@@ -69,13 +70,12 @@ func (c *DubboCodec) EncodeRequest(request *remoting.Request) (*bytes.Buffer, er
 	svc.Version = invocation.GetAttachmentWithDefaultValue(constant.VersionKey, "")
 	svc.Group = invocation.GetAttachmentWithDefaultValue(constant.GroupKey, "")
 	svc.Method = invocation.MethodName()
-	//timeout, err := strconv.Atoi(invocation.GetAttachmentWithDefaultValue(constant.TimeoutKey, strconv.Itoa(constant.DefaultRemotingTimeout)))
-	timeout := 300000
-	//if err != nil {
-	//	// it will be wrapped in readwrite.Write .
-	//	return nil, perrors.WithStack(err)
-	//}
-	svc.Timeout = time.Duration(timeout)
+	timeout, err := strconv.Atoi(invocation.GetAttachmentWithDefaultValue(constant.TimeoutKey, strconv.Itoa(constant.DefaultRemotingTimeout)))
+	if err != nil {
+		// it will be wrapped in readwrite.Write .
+		return nil, perrors.WithStack(err)
+	}
+	svc.Timeout = time.Duration(timeout) * time.Millisecond
 
 	header := impl.DubboHeader{}
 	serialization := invocation.GetAttachmentWithDefaultValue(constant.SerializationKey, constant.Hessian2Serialization)

diff --git a/protocol/dubbo/dubbo_invoker.go b/protocol/dubbo/dubbo_invoker.go
@@ -177,7 +177,7 @@ func (di *DubboInvoker) getTimeout(ivc *invocation.RPCInvocation) time.Duration
 		}
 	}
 	// set timeout into invocation
-	ivc.SetAttachment(constant.TimeoutKey, strconv.Itoa(int(timeout.Nanoseconds())))
+	ivc.SetAttachment(constant.TimeoutKey, strconv.Itoa(int(timeout.Milliseconds())))
 	return timeout
 }