@@ -31,14 +31,13 @@ import (
31
31
"sync/atomic"
32
32
"time"
33
33
34
+ "go.temporal.io/api/operatorservice/v1"
35
+ "go.temporal.io/api/workflowservice/v1"
34
36
"google.golang.org/grpc"
35
37
"google.golang.org/grpc/health"
36
38
healthpb "google.golang.org/grpc/health/grpc_health_v1"
37
39
"google.golang.org/grpc/reflection"
38
40
39
- "go.temporal.io/api/operatorservice/v1"
40
- "go.temporal.io/api/workflowservice/v1"
41
-
42
41
"go.temporal.io/server/api/adminservice/v1"
43
42
"go.temporal.io/server/common"
44
43
"go.temporal.io/server/common/dynamicconfig"
@@ -85,7 +84,7 @@ type Config struct {
85
84
WorkerBuildIdSizeLimit dynamicconfig.IntPropertyFn
86
85
DisallowQuery dynamicconfig.BoolPropertyFnWithNamespaceFilter
87
86
ShutdownDrainDuration dynamicconfig.DurationPropertyFn
88
- ShutdownFailHealthcheckDuration dynamicconfig.DurationPropertyFn
87
+ ShutdownFailHealthCheckDuration dynamicconfig.DurationPropertyFn
89
88
90
89
MaxBadBinaries dynamicconfig.IntPropertyFnWithNamespaceFilter
91
90
@@ -208,7 +207,7 @@ func NewConfig(dc *dynamicconfig.Collection, numHistoryShards int32, enableReadF
208
207
BlobSizeLimitWarn : dc .GetIntPropertyFilteredByNamespace (dynamicconfig .BlobSizeLimitWarn , 256 * 1024 ),
209
208
ThrottledLogRPS : dc .GetIntProperty (dynamicconfig .FrontendThrottledLogRPS , 20 ),
210
209
ShutdownDrainDuration : dc .GetDurationProperty (dynamicconfig .FrontendShutdownDrainDuration , 0 * time .Second ),
211
- ShutdownFailHealthcheckDuration : dc .GetDurationProperty (dynamicconfig .FrontendShutdownFailHealthcheckDuration , 10 * time .Second ),
210
+ ShutdownFailHealthCheckDuration : dc .GetDurationProperty (dynamicconfig .FrontendShutdownFailHealthCheckDuration , 0 * time .Second ),
212
211
EnableNamespaceNotActiveAutoForwarding : dc .GetBoolPropertyFnWithNamespaceFilter (dynamicconfig .EnableNamespaceNotActiveAutoForwarding , true ),
213
212
SearchAttributesNumberOfKeysLimit : dc .GetIntPropertyFilteredByNamespace (dynamicconfig .SearchAttributesNumberOfKeysLimit , 100 ),
214
213
SearchAttributesSizeOfValueLimit : dc .GetIntPropertyFilteredByNamespace (dynamicconfig .SearchAttributesSizeOfValueLimit , 2 * 1024 ),
@@ -342,7 +341,7 @@ func (s *Service) Stop() {
342
341
// 5. Stop everything forcefully and return
343
342
344
343
requestDrainTime := util .Max (time .Second , s .config .ShutdownDrainDuration ())
345
- failureDetectionTime := util .Max (0 , s .config .ShutdownFailHealthcheckDuration ())
344
+ failureDetectionTime := util .Max (0 , s .config .ShutdownFailHealthCheckDuration ())
346
345
347
346
logger .Info ("ShutdownHandler: Updating gRPC health status to ShuttingDown" )
348
347
s .healthServer .Shutdown ()
0 commit comments