CR: enable app limiter separately with EnableAppTxBacklogRateLimiting

config/localTemplate.go

@@ -241,6 +241,9 @@ type Local struct {
 	// TxBacklogRateLimitingCongestionRatio determines the backlog filling threashold in percents at which app limiter kicks in
 	TxBacklogRateLimitingCongestionPct int `version[32]:"50"`
 
+	// EnableAppTxBacklogRateLimiting controls if an app rate limiter should be attached to the tx backlog enqueue process
+	EnableAppTxBacklogRateLimiting bool `version[32]:"true"`
+
 	// EnableTxBacklogRateLimiting controls if a rate limiter and congestion manager should be attached to the tx backlog enqueue process
 	// if enabled, the over-all TXBacklog Size will be larger by MAX_PEERS*TxBacklogReservedCapacityPerPeer
 	EnableTxBacklogRateLimiting bool `version[27]:"false" version[30]:"true"`

config/local_defaults.go

@@ -62,6 +62,7 @@ var defaultLocal = Local{
 	EnableAccountUpdatesStats:                  false,
 	EnableAgreementReporting:                   false,
 	EnableAgreementTimeMetrics:                 false,
+	EnableAppTxBacklogRateLimiting:             true,
 	EnableAssembleStats:                        false,
 	EnableBlockService:                         false,
 	EnableBlockServiceFallbackToArchiver:       false,

data/txHandler.go

@@ -181,21 +181,23 @@ func MakeTxHandler(opts TxHandlerOpts) (*TxHandler, error) {
 		handler.txCanonicalCache = makeDigestCache(int(opts.Config.TxIncomingFilterMaxSize))
 	}
 
-	if opts.Config.EnableTxBacklogRateLimiting {
+	if opts.Config.EnableTxBacklogRateLimiting || opts.Config.EnableAppTxBacklogRateLimiting {
 		if opts.Config.TxBacklogRateLimitingCongestionPct > 100 || opts.Config.TxBacklogRateLimitingCongestionPct < 0 {
 			return nil, fmt.Errorf("invalid value for TxBacklogRateLimitingCongestionPct: %d", opts.Config.TxBacklogRateLimitingCongestionPct)
 		}
+		if opts.Config.EnableAppTxBacklogRateLimiting && opts.Config.TxBacklogAppTxRateLimiterMaxSize == 0 {
+			return nil, fmt.Errorf("invalid value for TxBacklogAppTxRateLimiterMaxSize: %d. App rate limiter enabled with zero size", opts.Config.TxBacklogAppTxRateLimiterMaxSize)
+		}
 		handler.backlogCongestionThreshold = float64(opts.Config.TxBacklogRateLimitingCongestionPct) / 100
-
-		rateLimiter := util.NewElasticRateLimiter(
-			txBacklogSize,
-			opts.Config.TxBacklogReservedCapacityPerPeer,
-			time.Duration(opts.Config.TxBacklogServiceRateWindowSeconds)*time.Second,
-			txBacklogDroppedCongestionManagement,
-		)
-		handler.erl = rateLimiter
-
-		if opts.Config.TxBacklogAppTxRateLimiterMaxSize > 0 {
+		if opts.Config.EnableTxBacklogRateLimiting {
+			handler.erl = util.NewElasticRateLimiter(
+				txBacklogSize,
+				opts.Config.TxBacklogReservedCapacityPerPeer,
+				time.Duration(opts.Config.TxBacklogServiceRateWindowSeconds)*time.Second,
+				txBacklogDroppedCongestionManagement,
+			)
+		}
+		if opts.Config.EnableAppTxBacklogRateLimiting {
 			handler.appLimiter = makeAppRateLimiter(
 				opts.Config.TxBacklogAppTxRateLimiterMaxSize,
 				uint64(opts.Config.TxBacklogAppTxPerSecondRate),

data/txHandler_test.go

@@ -2507,9 +2507,9 @@ func TestTxHandlerRestartWithBacklogAndTxPool(t *testing.T) { //nolint:parallelt
 	}
 }
 
-// check ERL and AppRateLimiter are either both enabled
+// check ERL and AppRateLimiter enablement with separate config values,
 // and the app limiter kicks in after congestion.
-func TestTxHandlerAppRateLimiterERLBothEnabled(t *testing.T) {
+func TestTxHandlerAppRateLimiterERLEnabled(t *testing.T) {
 	partitiontest.PartitionTest(t)
 	t.Parallel()
 
@@ -2519,7 +2519,6 @@ func TestTxHandlerAppRateLimiterERLBothEnabled(t *testing.T) {
 	log.SetLevel(logging.Panic)
 
 	cfg := config.GetDefaultLocal()
-	cfg.EnableTxBacklogRateLimiting = true
 	cfg.TxBacklogAppTxRateLimiterMaxSize = 100
 	cfg.TxBacklogServiceRateWindowSeconds = 1
 	cfg.TxBacklogAppTxPerSecondRate = 3
@@ -2531,11 +2530,37 @@ func TestTxHandlerAppRateLimiterERLBothEnabled(t *testing.T) {
 	defer ledger.Close()
 
 	l := ledger
+
+	func() {
+		cfg.EnableTxBacklogRateLimiting = false
+		cfg.EnableAppTxBacklogRateLimiting = false
+		handler, err := makeTestTxHandler(l, cfg)
+		require.NoError(t, err)
+		defer handler.txVerificationPool.Shutdown()
+		defer close(handler.streamVerifierDropped)
+
+		require.Nil(t, handler.erl)
+		require.Nil(t, handler.appLimiter)
+	}()
+
+	func() {
+		cfg.EnableTxBacklogRateLimiting = true
+		cfg.EnableAppTxBacklogRateLimiting = false
+		handler, err := makeTestTxHandler(l, cfg)
+		require.NoError(t, err)
+		defer handler.txVerificationPool.Shutdown()
+		defer close(handler.streamVerifierDropped)
+
+		require.NotNil(t, handler.erl)
+		require.Nil(t, handler.appLimiter)
+	}()
+
+	cfg.EnableTxBacklogRateLimiting = true
+	cfg.EnableAppTxBacklogRateLimiting = true
 	handler, err := makeTestTxHandler(l, cfg)
 	require.NoError(t, err)
 	defer handler.txVerificationPool.Shutdown()
 	defer close(handler.streamVerifierDropped)
-
 	require.NotNil(t, handler.erl)
 	require.NotNil(t, handler.appLimiter)
 

installer/config.json.example

@@ -41,6 +41,7 @@
     "EnableAccountUpdatesStats": false,
     "EnableAgreementReporting": false,
     "EnableAgreementTimeMetrics": false,
+    "EnableAppTxBacklogRateLimiting": true,
     "EnableAssembleStats": false,
     "EnableBlockService": false,
     "EnableBlockServiceFallbackToArchiver": false,

test/testdata/configs/config-v32.json

@@ -41,6 +41,7 @@
     "EnableAccountUpdatesStats": false,
     "EnableAgreementReporting": false,
     "EnableAgreementTimeMetrics": false,
+    "EnableAppTxBacklogRateLimiting": true,
     "EnableAssembleStats": false,
     "EnableBlockService": false,
     "EnableBlockServiceFallbackToArchiver": false,