diff --git a/common/dynamicconfig/constants.go b/common/dynamicconfig/constants.go index 255b983a7ab..4377ded4fc6 100644 --- a/common/dynamicconfig/constants.go +++ b/common/dynamicconfig/constants.go @@ -217,10 +217,6 @@ const ( FrontendHistoryMaxPageSize = "frontend.historyMaxPageSize" // FrontendRPS is workflow rate limit per second FrontendRPS = "frontend.rps" - // FrontendNamespaceReplicationInducingAPIsRPS limits the per second request rate for namespace replication inducing - // APIs (e.g. UpdateNamespace, UpdateWorkerBuildIdCompatibility). - // This config is EXPERIMENTAL and may be changed or removed in a later release. - FrontendNamespaceReplicationInducingAPIsRPS = "frontend.rps.namespaceReplicationInducingAPIs" // FrontendMaxNamespaceRPSPerInstance is workflow namespace rate limit per second FrontendMaxNamespaceRPSPerInstance = "frontend.namespaceRPS" // FrontendMaxNamespaceBurstPerInstance is workflow namespace burst limit diff --git a/service/frontend/fx.go b/service/frontend/fx.go index 56b5e3fdb89..8ba70978847 100644 --- a/service/frontend/fx.go +++ b/service/frontend/fx.go @@ -288,13 +288,12 @@ func RateLimitInterceptorProvider( serviceConfig *Config, ) *interceptor.RateLimitInterceptor { rateFn := func() float64 { return float64(serviceConfig.RPS()) } - namespaceReplicationInducingRateFn := func() float64 { return float64(serviceConfig.NamespaceReplicationInducingAPIsRPS()) } return interceptor.NewRateLimitInterceptor( configs.NewRequestToRateLimiter( quotas.NewDefaultIncomingRateLimiter(rateFn), quotas.NewDefaultIncomingRateLimiter(rateFn), - quotas.NewDefaultIncomingRateLimiter(namespaceReplicationInducingRateFn), + quotas.NewDefaultIncomingRateLimiter(rateFn), quotas.NewDefaultIncomingRateLimiter(rateFn), ), map[string]int{}, diff --git a/service/frontend/service.go b/service/frontend/service.go index 81b64acf0c8..ba2b6d0ec73 100644 --- a/service/frontend/service.go +++ b/service/frontend/service.go @@ -71,7 +71,6 @@ type Config struct { HistoryMaxPageSize dynamicconfig.IntPropertyFnWithNamespaceFilter RPS dynamicconfig.IntPropertyFn - NamespaceReplicationInducingAPIsRPS dynamicconfig.IntPropertyFn MaxNamespaceRPSPerInstance dynamicconfig.IntPropertyFnWithNamespaceFilter MaxNamespaceBurstPerInstance dynamicconfig.IntPropertyFnWithNamespaceFilter MaxNamespaceCountPerInstance dynamicconfig.IntPropertyFnWithNamespaceFilter @@ -203,9 +202,8 @@ func NewConfig( VisibilityDisableOrderByClause: dc.GetBoolPropertyFnWithNamespaceFilter(dynamicconfig.VisibilityDisableOrderByClause, true), VisibilityEnableManualPagination: dc.GetBoolPropertyFnWithNamespaceFilter(dynamicconfig.VisibilityEnableManualPagination, true), - HistoryMaxPageSize: dc.GetIntPropertyFilteredByNamespace(dynamicconfig.FrontendHistoryMaxPageSize, common.GetHistoryMaxPageSize), - RPS: dc.GetIntProperty(dynamicconfig.FrontendRPS, 2400), - NamespaceReplicationInducingAPIsRPS: dc.GetIntProperty(dynamicconfig.FrontendNamespaceReplicationInducingAPIsRPS, 5), + HistoryMaxPageSize: dc.GetIntPropertyFilteredByNamespace(dynamicconfig.FrontendHistoryMaxPageSize, common.GetHistoryMaxPageSize), + RPS: dc.GetIntProperty(dynamicconfig.FrontendRPS, 2400), MaxNamespaceRPSPerInstance: dc.GetIntPropertyFilteredByNamespace(dynamicconfig.FrontendMaxNamespaceRPSPerInstance, 2400), MaxNamespaceBurstPerInstance: dc.GetIntPropertyFilteredByNamespace(dynamicconfig.FrontendMaxNamespaceBurstPerInstance, 4800), diff --git a/tests/versioning_test.go b/tests/versioning_test.go index 04f73b98a4d..38768e290d3 100644 --- a/tests/versioning_test.go +++ b/tests/versioning_test.go @@ -78,7 +78,6 @@ func (s *versioningIntegSuite) SetupSuite() { // Make sure we don't hit the rate limiter in tests dynamicconfig.FrontendMaxNamespaceNamespaceReplicationInducingAPIsRPSPerInstance: 1000, dynamicconfig.FrontendMaxNamespaceNamespaceReplicationInducingAPIsBurstPerInstance: 1000, - dynamicconfig.FrontendNamespaceReplicationInducingAPIsRPS: 1000, // The dispatch tests below rely on being able to see the effects of changing // versioning data relatively quickly. In general we only promise to act on new diff --git a/tests/xdc/user_data_replication_test.go b/tests/xdc/user_data_replication_test.go index 12103ef84b8..95cfc303d47 100644 --- a/tests/xdc/user_data_replication_test.go +++ b/tests/xdc/user_data_replication_test.go @@ -66,7 +66,6 @@ func (s *userDataReplicationTestSuite) SetupSuite() { // Make sure we don't hit the rate limiter in tests dynamicconfig.FrontendMaxNamespaceNamespaceReplicationInducingAPIsRPSPerInstance: 1000, dynamicconfig.FrontendMaxNamespaceNamespaceReplicationInducingAPIsBurstPerInstance: 1000, - dynamicconfig.FrontendNamespaceReplicationInducingAPIsRPS: 1000, } s.setupSuite([]string{"task_queue_repl_active", "task_queue_repl_standby"}) }