testing: add config flag for ARL to count all messages

config/localTemplate.go

@@ -255,6 +255,12 @@ type Local struct {
 	// EnableTxBacklogAppRateLimiting controls if an app rate limiter should be attached to the tx backlog enqueue process
 	EnableTxBacklogAppRateLimiting bool `version[32]:"true"`
 
+	// TxBacklogAppRateLimitingCountERLDrops feeds messages dropped by the ERL congestion manager & rate limiter (enabled by
+	// EnableTxBacklogRateLimiting) to the app rate limiter (enabled by EnableTxBacklogAppRateLimiting), so that all TX messages
+	// are counted. This provides more accurate rate limiting for the app rate limiter, at the potential expense of additional
+	// deserialization overhead.
+	TxBacklogAppRateLimitingCountERLDrops bool `version[35]:"false"`
+
 	// 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

@@ -148,6 +148,7 @@ var defaultLocal = Local{
 	TrackerDBDir:                               "",
 	TransactionSyncDataExchangeRate:            0,
 	TransactionSyncSignificantMessageThreshold: 0,
+	TxBacklogAppRateLimitingCountERLDrops:      false,
 	TxBacklogAppTxPerSecondRate:                100,
 	TxBacklogAppTxRateLimiterMaxSize:           1048576,
 	TxBacklogRateLimitingCongestionPct:         50,

data/txHandler.go

@@ -132,6 +132,7 @@
 	erl                        *util.ElasticRateLimiter
 	appLimiter                 *appRateLimiter
 	appLimiterBacklogThreshold int
+	appLimiterCountERLDrops    bool
 
 	// batchVerifier provides synchronous verification of transaction groups, used only by pubsub validation in validateIncomingTxMessage.
 	batchVerifier verify.TxnGroupBatchSigVerifier
@@ -209,6 +210,7 @@
 			)
 			// set appLimiter triggering threshold at 50% of the base backlog size
 			handler.appLimiterBacklogThreshold = int(float64(opts.Config.TxBacklogSize) * float64(opts.Config.TxBacklogRateLimitingCongestionPct) / 100)
+			handler.appLimiterCountERLDrops = opts.Config.TxBacklogAppRateLimitingCountERLDrops
 		}
 	}
 
@@ -743,6 +745,12 @@
 	}()
 
 	if shouldDrop {
+		if handler.appLimiterCountERLDrops {
+			// decode and let ARL count this txgroup, even though ERL is dropping it
+			if unverifiedTxGroup, _, invalid := decodeMsg(rawmsg.Data); !invalid {
+				handler.incomingTxGroupAppRateLimit(unverifiedTxGroup, rawmsg.Sender)
+			}
+		}
 		// this TX message was rate-limited by ERL
 		return network.OutgoingMessage{Action: network.Ignore}
 	}

installer/config.json.example

@@ -127,6 +127,7 @@
     "TrackerDBDir": "",
     "TransactionSyncDataExchangeRate": 0,
     "TransactionSyncSignificantMessageThreshold": 0,
+    "TxBacklogAppRateLimitingCountERLDrops": false,
     "TxBacklogAppTxPerSecondRate": 100,
     "TxBacklogAppTxRateLimiterMaxSize": 1048576,
     "TxBacklogRateLimitingCongestionPct": 50,

test/testdata/configs/config-v35.json

@@ -127,6 +127,7 @@
     "TrackerDBDir": "",
     "TransactionSyncDataExchangeRate": 0,
     "TransactionSyncSignificantMessageThreshold": 0,
+    "TxBacklogAppRateLimitingCountERLDrops": false,
     "TxBacklogAppTxPerSecondRate": 100,
     "TxBacklogAppTxRateLimiterMaxSize": 1048576,
     "TxBacklogRateLimitingCongestionPct": 50,