fix bugs related ShutdownConfig

config/graceful_shutdown.go

@@ -163,7 +163,7 @@ func waitForReceivingRequests() {
 		// ignore this step
 		return
 	}
-	providerConfig.ShutdownConfig.GracefulShutdownStarted = true
+	providerConfig.ShutdownConfig.RejectRequest = true
 	waitingProcessedTimeout(providerConfig.ShutdownConfig)
 }
 
@@ -174,7 +174,7 @@ func waitForSendingRequests() {
 		// ignore this step
 		return
 	}
-	consumerConfig.ShutdownConfig.GracefulShutdownStarted = true
+	consumerConfig.ShutdownConfig.RejectRequest = true
 	waitingProcessedTimeout(consumerConfig.ShutdownConfig)
 }
 

config/graceful_shutdown_config.go

@@ -50,8 +50,6 @@ type ShutdownConfig struct {
 	StepTimeout string `default:"10s" yaml:"step_timeout" json:"step.timeout,omitempty" property:"step.timeout"`
 	// when we try to shutdown the application, we will reject the new requests. In most cases, you don't need to configure this.
 	RejectRequestHandler string `yaml:"reject_handler" json:"reject_handler,omitempty" property:"reject_handler"`
-	// true -> graceful shutdown started
-	GracefulShutdownStarted bool
 	// true -> new request will be rejected.
 	RejectRequest bool
 	// true -> all requests had been processed. In provider side it means that all requests are returned response to clients

filter/filter_impl/graceful_shutdown_filter.go

@@ -60,14 +60,17 @@ func (gf *gracefulShutdownFilter) Invoke(ctx context.Context, invoker protocol.I
 		return gf.getRejectHandler().RejectedExecution(invoker.GetURL(), invocation)
 	}
 	atomic.AddInt32(&gf.activeCount, 1)
+	if gf.shutdownConfig != nil && gf.activeCount > 0 {
+		gf.shutdownConfig.RequestsFinished = false
+	}
 	return invoker.Invoke(ctx, invocation)
 }
 
 // OnResponse reduces the number of active processes then return the process result
 func (gf *gracefulShutdownFilter) OnResponse(ctx context.Context, result protocol.Result, invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
 	atomic.AddInt32(&gf.activeCount, -1)
 	// although this isn't thread safe, it won't be a problem if the gf.rejectNewRequest() is true.
-	if gf.shutdownConfig != nil && gf.shutdownConfig.GracefulShutdownStarted && gf.activeCount <= 0 {
+	if gf.shutdownConfig != nil && gf.activeCount <= 0 {
 		gf.shutdownConfig.RequestsFinished = true
 	}
 	return result