Merge pull request #19 from PowerLoom/feat/configurable-pool-limits

Feat/configurable pool limits
PowerLoom · Oct 17, 2024 · cb7ef87 · cb7ef87
2 parents 99e23cc + 00466a6
commit cb7ef87
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/config/settings.example.json b/config/settings.example.json
@@ -4,5 +4,7 @@
   "SignerAccountAddress": "SIGNER_ACCOUNT_ADDRESS",
   "LocalCollectorPort": "LOCAL_COLLECTOR_PORT",
   "TrustedRelayersListUrl" : "TRUSTED_RELAYERS_LIST_URL",
-  "DataMarketAddress" : "DATA_MARKET_CONTRACT"
+  "DataMarketAddress" : "DATA_MARKET_CONTRACT",
+  "MaxStreamPoolSize" : MAX_STREAM_POOL_SIZE,
+  "StreamPoolHealthCheckInterval" : STREAM_POOL_HEALTH_CHECK_INTERVAL
 }
diff --git a/config/settings.go b/config/settings.go
@@ -20,6 +20,8 @@ type Settings struct {
 	PortNumber             string `json:"LocalCollectorPort"`
 	TrustedRelayersListUrl string `json:"TrustedRelayersListUrl"`
 	DataMarketAddress      string `json:"DataMarketAddress"`
+	MaxStreamPoolSize             int `json:"MaxStreamPoolSize"`
+	StreamPoolHealthCheckInterval int `json:"StreamPoolHealthCheckInterval"`
 }
 
 func LoadConfig() {
@@ -45,5 +47,13 @@ func LoadConfig() {
 		config.TrustedRelayersListUrl = "https://raw.githubusercontent.com/PowerLoom/snapshotter-lite-local-collector/feat/trusted-relayers/relayers.json"
 	}
 
+	// Set default values for new fields if not specified in the config file
+	if config.MaxStreamPoolSize == 0 {
+		config.MaxStreamPoolSize = 2 // Default to 2 as per your current setup
+	}
+	if config.StreamPoolHealthCheckInterval == 0 {
+		config.StreamPoolHealthCheckInterval = 30 // Default to 30 seconds
+	}
+
 	SettingsObj = &config
 }
diff --git a/pkgs/service/libp2p_stream_pool.go b/pkgs/service/libp2p_stream_pool.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"proto-snapshot-server/config"
 	"sync"
 	"time"
 
@@ -63,7 +64,7 @@ func (p *streamPool) Stop() {
 }
 
 func (p *streamPool) maintainPool(ctx context.Context) {
-	ticker := time.NewTicker(900 * time.Second)
+	ticker := time.NewTicker(time.Duration(config.SettingsObj.StreamPoolHealthCheckInterval) * time.Second)
 	defer ticker.Stop()
 
 	for {

diff --git a/pkgs/service/msg_server.go b/pkgs/service/msg_server.go
@@ -86,7 +86,7 @@ func NewMsgServerImpl() pkgs.SubmissionServer {
 		return stream, nil
 	}
 	return &server{
-		streamPool: newStreamPool(1024, sequencerID, createStream), // Adjust pool size as needed
+		streamPool: newStreamPool(config.SettingsObj.MaxStreamPoolSize, sequencerID, createStream),
 	}
 }
 

diff --git a/server_autofill.sh b/server_autofill.sh
@@ -14,6 +14,8 @@ if [ -z "$DATA_MARKET_CONTRACT" ]; then
     exit 1;
 fi
 
+export MAX_STREAM_POOL_SIZE="${MAX_STREAM_POOL_SIZE:-2}"
+export STREAM_POOL_HEALTH_CHECK_INTERVAL="${STREAM_POOL_HEALTH_CHECK_INTERVAL:-30}"
 cd config
 
 # Template to actual settings.json manipulation
@@ -35,7 +37,9 @@ sed -i'.backup' -e "s#POWERLOOM_REPORTING_URL#$POWERLOOM_REPORTING_URL#" \
                 -e "s#LOCAL_COLLECTOR_PORT#$LOCAL_COLLECTOR_PORT#" \
                 -e "s#RELAYER_PRIVATE_KEY#$RELAYER_PRIVATE_KEY#" settings.json \
                 -e "s#TRUSTED_RELAYERS_LIST_URL#$TRUSTED_RELAYERS_LIST_URL#" settings.json \
-                -e "s#DATA_MARKET_CONTRACT#$DATA_MARKET_CONTRACT#" settings.json
+                -e "s#DATA_MARKET_CONTRACT#$DATA_MARKET_CONTRACT#" settings.json \
+                -e "s#MAX_STREAM_POOL_SIZE#$MAX_STREAM_POOL_SIZE#" settings.json \
+                -e "s#STREAM_POOL_HEALTH_CHECK_INTERVAL#$STREAM_POOL_HEALTH_CHECK_INTERVAL#" settings.json
 
 # Cleanup backup file
 rm settings.json.backup