From 5ff8d34acc30b56b92e27218e292409d3263ef48 Mon Sep 17 00:00:00 2001
From: AlexStocks <alexstocks@foxmail.com>
Date: Sat, 11 Jan 2020 22:44:52 +0800
Subject: [PATCH] Imp: check sessin timeout; change default client conf params
---
go.sum | 3 ---
protocol/dubbo/config.go | 23 +++++++++++++++++------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/go.sum b/go.sum
index 8b59bfd9d..2054d4f5c 100644
--- a/go.sum
+++ b/go.sum
@@ -102,11 +102,8 @@ github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF
github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dubbogo/getty v1.3.1 h1:9fehwTo/D6+z6/+kADMbhbKeMkP80o/3g+XwV5lFLTY=
-github.com/dubbogo/getty v1.3.1/go.mod h1:dtLOEb1v6EMHsQNYRWEACiRLmTWB2kJGUAj1aXayPOg=
github.com/dubbogo/getty v1.3.2 h1:l1KVSs/1CtTKbIPTrkTtBT6S9ddvmswDGoAnnl2CDpM=
github.com/dubbogo/getty v1.3.2/go.mod h1:ANbVQ9tbpZ2b0xdR8nRrgS/oXIsZAeRxzvPSOn/7mbk=
-github.com/dubbogo/gost v1.1.1/go.mod h1:R7wZm1DrmrKGr50mBZVcg6C9ekG8aL5hP+sgWcIDwQg=
github.com/dubbogo/gost v1.5.1 h1:oG5dzaWf1KYynBaBoUIOkgT+YD0niHV6xxI0Odq7hDg=
github.com/dubbogo/gost v1.5.1/go.mod h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8=
github.com/dubbogo/gost v1.5.2 h1:ri/03971hdpnn3QeCU+4UZgnRNGDXLDGDucR/iozZm8=
diff --git a/protocol/dubbo/config.go b/protocol/dubbo/config.go
index 5371c5874..322979338 100644
--- a/protocol/dubbo/config.go
+++ b/protocol/dubbo/config.go
@@ -23,6 +23,7 @@ import (
import (
perrors "github.com/pkg/errors"
+ "github.com/dubbogo/getty"
)
type (
@@ -94,9 +95,9 @@ func GetDefaultClientConfig() ClientConfig {
return ClientConfig{
ReconnectInterval: 0,
ConnectionNum: 16,
- HeartbeatPeriod: "5s",
- SessionTimeout: "20s",
- PoolSize: 64,
+ HeartbeatPeriod: "30s",
+ SessionTimeout: "180s",
+ PoolSize: 4,
PoolTTL: 600,
GrPoolSize: 200,
QueueLen: 64,
@@ -105,7 +106,7 @@ func GetDefaultClientConfig() ClientConfig {
CompressEncoding: false,
TcpNoDelay: true,
TcpKeepAlive: true,
- KeepAlivePeriod: "120s",
+ KeepAlivePeriod: "180s",
TcpRBufSize: 262144,
TcpWBufSize: 65536,
PkgWQSize: 512,
@@ -119,7 +120,7 @@ func GetDefaultClientConfig() ClientConfig {
func GetDefaultServerConfig() ServerConfig {
return ServerConfig{
- SessionTimeout: "20s",
+ SessionTimeout: "180s",
SessionNumber: 700,
GrPoolSize: 120,
QueueNumber: 6,
@@ -128,7 +129,7 @@ func GetDefaultServerConfig() ServerConfig {
CompressEncoding: false,
TcpNoDelay: true,
TcpKeepAlive: true,
- KeepAlivePeriod: "120s",
+ KeepAlivePeriod: "180s",
TcpRBufSize: 262144,
TcpWBufSize: 65536,
PkgWQSize: 512,
@@ -172,6 +173,11 @@ func (c *ClientConfig) CheckValidity() error {
return perrors.WithMessagef(err, "time.ParseDuration(HeartbeatPeroid{%#v})", c.HeartbeatPeriod)
}
+ if c.heartbeatPeriod >= time.Duration(getty.MaxWheelTimeSpan) {
+ return perrors.WithMessagef(err, "heartbeat_period %s should be less than %s",
+ c.HeartbeatPeriod, time.Duration(getty.MaxWheelTimeSpan))
+ }
+
if c.sessionTimeout, err = time.ParseDuration(c.SessionTimeout); err != nil {
return perrors.WithMessagef(err, "time.ParseDuration(SessionTimeout{%#v})", c.SessionTimeout)
}
@@ -186,5 +192,10 @@ func (c *ServerConfig) CheckValidity() error {
return perrors.WithMessagef(err, "time.ParseDuration(SessionTimeout{%#v})", c.SessionTimeout)
}
+ if c.sessionTimeout >= time.Duration(getty.MaxWheelTimeSpan) {
+ return perrors.WithMessagef(err, "session_timeout %s should be less than %s",
+ c.SessionTimeout, time.Duration(getty.MaxWheelTimeSpan))
+ }
+
return perrors.WithStack(c.GettySessionParam.CheckValidity())
}
--
GitLab