[dubbo-go] branch 3.0 updated: fix(config): fix the type of reject request (#1749)

[zhaoyunxing]

This is an automated email from the ASF dual-hosted git repository.

zhaoyunxing pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new 2cf7424  fix(config): fix the type of reject request (#1749)
2cf7424 is described below

commit 2cf74243cec4f04c00e580e39dde2800f0b97330
Author: Xuewei Niu <a...@nxw.name>
AuthorDate: Fri Feb 11 16:45:20 2022 +0800

    fix(config): fix the type of reject request (#1749)
---
 config/graceful_shutdown_config.go               | 4 ++--
 config/graceful_shutdown_config_test.go          | 2 +-
 filter/graceful_shutdown/procider_filter_test.go | 2 +-
 filter/graceful_shutdown/provider_filter.go      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/graceful_shutdown_config.go 
b/config/graceful_shutdown_config.go
index e2b50c1..7b96927 100644
--- a/config/graceful_shutdown_config.go
+++ b/config/graceful_shutdown_config.go
@@ -67,7 +67,7 @@ type ShutdownConfig struct {
        InternalSignal bool `default:"true" yaml:"internal-signal" 
json:"internal.signal,omitempty" property:"internal.signal"`
 
        // true -> new request will be rejected.
-       RejectRequest bool
+       RejectRequest atomic.Bool
        // active invocation
        ConsumerActiveCount atomic.Int32
        ProviderActiveCount atomic.Int32
@@ -138,7 +138,7 @@ func (scb *ShutdownConfigBuilder) 
SetRejectRequestHandler(rejectRequestHandler s
 }
 
 func (scb *ShutdownConfigBuilder) SetRejectRequest(rejectRequest bool) 
*ShutdownConfigBuilder {
-       scb.shutdownConfig.RejectRequest = rejectRequest
+       scb.shutdownConfig.RejectRequest.Store(rejectRequest)
        return scb
 }
 
diff --git a/config/graceful_shutdown_config_test.go 
b/config/graceful_shutdown_config_test.go
index 1c77a2b..a612200 100644
--- a/config/graceful_shutdown_config_test.go
+++ b/config/graceful_shutdown_config_test.go
@@ -28,7 +28,7 @@ import (
 
 func TestShutdownConfigGetTimeout(t *testing.T) {
        config := ShutdownConfig{}
-       assert.False(t, config.RejectRequest)
+       assert.False(t, config.RejectRequest.Load())
 
        config = ShutdownConfig{
                Timeout:     "60s",
diff --git a/filter/graceful_shutdown/procider_filter_test.go 
b/filter/graceful_shutdown/procider_filter_test.go
index 086373a..d03b61d 100644
--- a/filter/graceful_shutdown/procider_filter_test.go
+++ b/filter/graceful_shutdown/procider_filter_test.go
@@ -65,7 +65,7 @@ func TestProviderFilterInvoke(t *testing.T) {
        assert.NotNil(t, result)
        assert.Nil(t, result.Error())
 
-       config.GetShutDown().RejectRequest = true
+       config.GetShutDown().RejectRequest.Store(true)
        result = filter.Invoke(context.Background(), 
protocol.NewBaseInvoker(url), invocation)
        assert.NotNil(t, result)
        assert.NotNil(t, result.Error().Error(), "Rejected")
diff --git a/filter/graceful_shutdown/provider_filter.go 
b/filter/graceful_shutdown/provider_filter.go
index d428f1f..2ab3ade 100644
--- a/filter/graceful_shutdown/provider_filter.go
+++ b/filter/graceful_shutdown/provider_filter.go
@@ -89,7 +89,7 @@ func (f *providerGracefulShutdownFilter) rejectNewRequest() 
bool {
        if f.shutdownConfig == nil {
                return false
        }
-       return f.shutdownConfig.RejectRequest
+       return f.shutdownConfig.RejectRequest.Load()
 }
 
 func (f *providerGracefulShutdownFilter) getRejectHandler() 
filter.RejectedExecutionHandler {