rft(getty): delete outdated getty params

apache · Aug 19, 2021 · cda10ba · cda10ba
1 parent 1d112da
commit cda10ba
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 28 deletions.
diff --git a/config/testdata/consumer_config.properties b/config/testdata/consumer_config.properties
@@ -44,7 +44,6 @@ protocol_conf.dubbo.getty_session_param.tcp_keep_alive=true
 protocol_conf.dubbo.getty_session_param.keep_alive_period=120s
 protocol_conf.dubbo.getty_session_param.tcp_r_buf_size=262144
 protocol_conf.dubbo.getty_session_param.tcp_w_buf_size=65536
-protocol_conf.dubbo.getty_session_param.pkg_wq_size=512
 protocol_conf.dubbo.getty_session_param.tcp_read_timeout=1s
 protocol_conf.dubbo.getty_session_param.tcp_write_timeout=5s
 protocol_conf.dubbo.getty_session_param.wait_timeout=1s

diff --git a/config/testdata/consumer_config.yml b/config/testdata/consumer_config.yml
@@ -87,7 +87,6 @@ protocol_conf:
       keep_alive_period: "120s"
       tcp_r_buf_size: 262144
       tcp_w_buf_size: 65536
-      pkg_wq_size: 512
       tcp_read_timeout: "1s"
       tcp_write_timeout: "5s"
       wait_timeout: "1s"

diff --git a/config/testdata/consumer_config_with_configcenter.yml b/config/testdata/consumer_config_with_configcenter.yml
@@ -36,7 +36,6 @@ protocol_conf:
       keep_alive_period: "120s"
       tcp_r_buf_size: 262144
       tcp_w_buf_size: 65536
-      pkg_wq_size: 512
       tcp_read_timeout: "1s"
       tcp_write_timeout: "5s"
       wait_timeout: "1s"

diff --git a/config/testdata/consumer_config_withoutProtocol.yml b/config/testdata/consumer_config_withoutProtocol.yml
@@ -73,7 +73,6 @@ protocol_conf:
       keep_alive_period: "120s"
       tcp_r_buf_size: 262144
       tcp_w_buf_size: 65536
-      pkg_wq_size: 512
       tcp_read_timeout: "1s"
       tcp_write_timeout: "5s"
       wait_timeout: "1s"

diff --git a/config/testdata/provider_config.properties b/config/testdata/provider_config.properties
@@ -50,7 +50,6 @@ protocol_conf.dubbo.getty_session_param.tcp_keep_alive=true
 protocol_conf.dubbo.getty_session_param.keep_alive_period=120s
 protocol_conf.dubbo.getty_session_param.tcp_r_buf_size=262144
 protocol_conf.dubbo.getty_session_param.tcp_w_buf_size=65536
-protocol_conf.dubbo.getty_session_param.pkg_wq_size=512
 protocol_conf.dubbo.getty_session_param.tcp_read_timeout=1s
 protocol_conf.dubbo.getty_session_param.tcp_write_timeout=5s
 protocol_conf.dubbo.getty_session_param.wait_timeout=1s

diff --git a/config/testdata/provider_config.yml b/config/testdata/provider_config.yml
@@ -92,7 +92,6 @@ protocol_conf:
       keep_alive_period: "120s"
       tcp_r_buf_size: 262144
       tcp_w_buf_size: 65536
-      pkg_wq_size: 512
       tcp_read_timeout: "1s"
       tcp_write_timeout: "5s"
       wait_timeout: "1s"

diff --git a/config/testdata/provider_config_withoutProtocol.yml b/config/testdata/provider_config_withoutProtocol.yml
@@ -72,7 +72,6 @@ protocol_conf:
       keep_alive_period: "120s"
       tcp_r_buf_size: 262144
       tcp_w_buf_size: 65536
-      pkg_wq_size: 512
       tcp_read_timeout: "1s"
       tcp_write_timeout: "5s"
       wait_timeout: "1s"

diff --git a/config_center/apollo/impl_test.go b/config_center/apollo/impl_test.go
@@ -111,7 +111,6 @@ var (
 		"application.environment": "dev",
 		"services.UserProvider.protocol": "dubbo",
 		"application.organization": "ikurento.com",
-		"protocol_conf.dubbo.getty_session_param.pkg_wq_size": "512",
 		"services.UserProvider.methods[0].loadbalance": "random"
 	},
 	"releaseKey": "20191104105242-0f13805d89f834a4"

diff --git a/metadata/service/exporter/configurable/exporter_test.go b/metadata/service/exporter/configurable/exporter_test.go
@@ -46,7 +46,6 @@ func TestConfigurableExporter(t *testing.T) {
 			KeepAlivePeriod:  "120s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "1s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",

diff --git a/protocol/dubbo/dubbo_invoker_test.go b/protocol/dubbo/dubbo_invoker_test.go
@@ -113,7 +113,6 @@ func InitTest(t *testing.T) (protocol.Protocol, *common.URL) {
 			KeepAlivePeriod:  "120s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "4s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",
@@ -131,7 +130,6 @@ func InitTest(t *testing.T) (protocol.Protocol, *common.URL) {
 			KeepAlivePeriod:  "120s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "1s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",

diff --git a/protocol/dubbo/dubbo_protocol_test.go b/protocol/dubbo/dubbo_protocol_test.go
@@ -52,7 +52,6 @@ func initDubboInvokerTest() {
 			KeepAlivePeriod:  "120s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "1s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",
@@ -70,7 +69,6 @@ func initDubboInvokerTest() {
 			KeepAlivePeriod:  "120s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "4s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",

diff --git a/remoting/getty/config.go b/remoting/getty/config.go
@@ -39,7 +39,6 @@ type (
 		keepAlivePeriod  time.Duration
 		TcpRBufSize      int    `default:"262144" yaml:"tcp_r_buf_size" json:"tcp_r_buf_size,omitempty"`
 		TcpWBufSize      int    `default:"65536" yaml:"tcp_w_buf_size" json:"tcp_w_buf_size,omitempty"`
-		PkgWQSize        int    `default:"1024" yaml:"pkg_wq_size" json:"pkg_wq_size,omitempty"`
 		TcpReadTimeout   string `default:"1s" yaml:"tcp_read_timeout" json:"tcp_read_timeout,omitempty"`
 		tcpReadTimeout   time.Duration
 		TcpWriteTimeout  string `default:"5s" yaml:"tcp_write_timeout" json:"tcp_write_timeout,omitempty"`
@@ -67,7 +66,7 @@ type (
 		sessionTimeout time.Duration
 		SessionNumber  int `default:"1000" yaml:"session_number" json:"session_number,omitempty"`
 
-		// grpool
+		// gr pool
 		GrPoolSize  int `default:"0" yaml:"gr_pool_size" json:"gr_pool_size,omitempty"`
 		QueueLen    int `default:"0" yaml:"queue_len" json:"queue_len,omitempty"`
 		QueueNumber int `default:"0" yaml:"queue_number" json:"queue_number,omitempty"`
@@ -95,7 +94,7 @@ type (
 		SessionTimeout string `default:"60s" yaml:"session_timeout" json:"session_timeout,omitempty"`
 		sessionTimeout time.Duration
 
-		// grpool
+		// gr pool
 		GrPoolSize  int `default:"0" yaml:"gr_pool_size" json:"gr_pool_size,omitempty"`
 		QueueLen    int `default:"0" yaml:"queue_len" json:"queue_len,omitempty"`
 		QueueNumber int `default:"0" yaml:"queue_number" json:"queue_number,omitempty"`
@@ -122,7 +121,6 @@ func GetDefaultClientConfig() ClientConfig {
 			KeepAlivePeriod:  "180s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "1s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",
@@ -146,7 +144,6 @@ func GetDefaultServerConfig() ServerConfig {
 			KeepAlivePeriod:  "180s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "1s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",

diff --git a/remoting/getty/dubbo_codec_for_test.go b/remoting/getty/dubbo_codec_for_test.go
@@ -25,11 +25,12 @@ import (
 )
 
 import (
+	hessian "github.com/apache/dubbo-go-hessian2"
+
 	perrors "github.com/pkg/errors"
 )
 
 import (
-	hessian "github.com/apache/dubbo-go-hessian2"
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/dubbo/impl"

diff --git a/remoting/getty/getty_client_test.go b/remoting/getty/getty_client_test.go
@@ -27,13 +27,14 @@ import (
 )
 
 import (
+	hessian "github.com/apache/dubbo-go-hessian2"
+
 	perrors "github.com/pkg/errors"
 
 	"github.com/stretchr/testify/assert"
 )
 
 import (
-	hessian "github.com/apache/dubbo-go-hessian2"
 	"github.com/apache/dubbo-go/common"
 	. "github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/protocol"

diff --git a/remoting/getty/listener.go b/remoting/getty/listener.go
@@ -27,13 +27,14 @@ import (
 import (
 	"github.com/apache/dubbo-getty"
 
+	hessian "github.com/apache/dubbo-go-hessian2"
+
 	gxtime "github.com/dubbogo/gost/time"
 
 	perrors "github.com/pkg/errors"
 )
 
 import (
-	hessian "github.com/apache/dubbo-go-hessian2"
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/common/logger"
 	"github.com/apache/dubbo-go/protocol/invocation"

diff --git a/remoting/getty/readwriter.go b/remoting/getty/readwriter.go
@@ -25,11 +25,12 @@ import (
 import (
 	"github.com/apache/dubbo-getty"
 
+	hessian "github.com/apache/dubbo-go-hessian2"
+
 	perrors "github.com/pkg/errors"
 )
 
 import (
-	hessian "github.com/apache/dubbo-go-hessian2"
 	"github.com/apache/dubbo-go/common/logger"
 	"github.com/apache/dubbo-go/remoting"
 )

diff --git a/remoting/getty/readwriter_test.go b/remoting/getty/readwriter_test.go
@@ -24,11 +24,12 @@ import (
 )
 
 import (
+	hessian "github.com/apache/dubbo-go-hessian2"
+
 	"github.com/stretchr/testify/assert"
 )
 
 import (
-	hessian "github.com/apache/dubbo-go-hessian2"
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/common/proxy/proxy_factory"
@@ -69,7 +70,6 @@ func initTestEnvironment(t *testing.T) {
 			KeepAlivePeriod:  "120s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "4s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",
@@ -88,7 +88,6 @@ func initTestEnvironment(t *testing.T) {
 			KeepAlivePeriod:  "120s",
 			TcpRBufSize:      262144,
 			TcpWBufSize:      65536,
-			PkgWQSize:        512,
 			TcpReadTimeout:   "1s",
 			TcpWriteTimeout:  "5s",
 			WaitTimeout:      "1s",

diff --git a/test/integrate/dubbo/go-client/client.yml b/test/integrate/dubbo/go-client/client.yml
@@ -53,7 +53,6 @@ protocol_conf:
       tcp_r_buf_size: 262144
       tcp_w_buf_size: 65536
       pkg_rq_size: 1024
-      pkg_wq_size: 512
       tcp_read_timeout: "1s"
       tcp_write_timeout: "5s"
       wait_timeout: "1s"

diff --git a/test/integrate/dubbo/go-server/server.yml b/test/integrate/dubbo/go-server/server.yml
@@ -49,7 +49,6 @@ protocol_conf:
       tcp_r_buf_size: 262144
       tcp_w_buf_size: 65536
       pkg_rq_size: 1024
-      pkg_wq_size: 512
       tcp_read_timeout: "1s"
       tcp_write_timeout: "5s"
       wait_timeout: "1s"

diff --git a/tools/cli/example/server/config/server.yml b/tools/cli/example/server/config/server.yml
@@ -50,7 +50,6 @@ protocol_conf:
       tcp_r_buf_size: 262144
       tcp_w_buf_size: 65536
       pkg_rq_size: 1024
-      pkg_wq_size: 512
       tcp_read_timeout: "1s"
       tcp_write_timeout: "5s"
       wait_timeout: "1s"