From b800128079b85fa8383151a7e103c5b3f33a18e3 Mon Sep 17 00:00:00 2001 From: mark4z Date: Wed, 24 Apr 2024 23:11:45 +0800 Subject: [PATCH 1/2] support custom dubbo invoke retries times --- pkg/client/dubbo/config.go | 4 +++- pkg/client/dubbo/dubbo.go | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkg/client/dubbo/config.go b/pkg/client/dubbo/config.go index c4055913c..91a562c12 100644 --- a/pkg/client/dubbo/config.go +++ b/pkg/client/dubbo/config.go @@ -33,6 +33,8 @@ type DubboProxyConfig struct { AutoResolve bool `yaml:"auto_resolve" json:"auto_resolve,omitempty"` // Protoset path to load protoset files Protoset []string `yaml:"protoset" json:"protoset,omitempty"` - // Load + // Load load balance LoadBalance string `yaml:"load_balance" json:"load_balance,omitempty"` + // Retries number of retries + Retries string `yaml:"retries" json:"retries,omitempty"` } diff --git a/pkg/client/dubbo/dubbo.go b/pkg/client/dubbo/dubbo.go index ad323caf2..ca3e61c3e 100644 --- a/pkg/client/dubbo/dubbo.go +++ b/pkg/client/dubbo/dubbo.go @@ -319,12 +319,15 @@ func (dc *Client) create(key string, irequest fc.IntegrationRequest) *generic.Ge Version: irequest.DubboBackendConfig.Version, Group: irequest.Group, Loadbalance: dc.dubboProxyConfig.LoadBalance, + Retries: dc.dubboProxyConfig.Retries, } - if len(irequest.DubboBackendConfig.Retries) == 0 { - refConf.Retries = "3" - } else { - refConf.Retries = irequest.DubboBackendConfig.Retries + if refConf.Retries == "" { + if len(irequest.DubboBackendConfig.Retries) == 0 { + refConf.Retries = "3" + } else { + refConf.Retries = irequest.DubboBackendConfig.Retries + } } if dc.dubboProxyConfig.Timeout != nil { From 31aae37d75d6eddcc25e2d75809287bd58a58486 Mon Sep 17 00:00:00 2001 From: Mark4z <36187602+mark4z@users.noreply.github.com> Date: Thu, 25 Apr 2024 14:59:19 +0800 Subject: [PATCH 2/2] Update config.go --- pkg/client/dubbo/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/client/dubbo/config.go b/pkg/client/dubbo/config.go index 91a562c12..f4e56a97f 100644 --- a/pkg/client/dubbo/config.go +++ b/pkg/client/dubbo/config.go @@ -33,7 +33,7 @@ type DubboProxyConfig struct { AutoResolve bool `yaml:"auto_resolve" json:"auto_resolve,omitempty"` // Protoset path to load protoset files Protoset []string `yaml:"protoset" json:"protoset,omitempty"` - // Load load balance + // Load balance LoadBalance string `yaml:"load_balance" json:"load_balance,omitempty"` // Retries number of retries Retries string `yaml:"retries" json:"retries,omitempty"`