Merge branch 'v1.0-dev' into chore/dashmate/update-template-to-1.1.0

dashpay · Aug 25, 2024 · a431f84 · a431f84
2 parents 947fae3 + d2a3a36
commit a431f84
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ansible/roles/dashmate/defaults/main.yml b/ansible/roles/dashmate/defaults/main.yml
@@ -17,6 +17,7 @@ dashmate_platform_tenderdash_pprof_enable: false
 dashmate_platform_gateway_log_level: info
 dashmate_platform_gateway_max_connections: 5000
 dashmate_platform_gateway_listeners_dapi_and_drive_http2_max_concurrent_streams: 100
+dashmate_platform_gateway_listeners_dapi_and_drive_wait_for_st_result_timeout: "125s"
 dashmate_platform_gateway_max_heap_size_in_bytes: 125000000 # 1 Gb
 dashmate_platform_gateway_upstreams_drive_grpc_max_requests: 10000
 dashmate_platform_gateway_upstreams_dapi_api_max_requests: 10000
@@ -32,12 +33,15 @@ dashmate_platform_gateway_rate_limiter_metrics_port: 9102
 dashmate_platform_gateway_rate_limiter_unit: "minute"
 dashmate_platform_gateway_rate_limiter_requests_per_unit: 150
 dashmate_platform_dapi_api_docker_deploy_replicas: 1
+dashmate_platform_dapi_api_wait_for_st_result_timeout: 120000
 dashmate_platform_drive_abci_metrics_enabled: false
 dashmate_platform_drive_abci_metrics_port: 29090
 dashmate_platform_drive_tenderdash_p2p_flush_throttle_timeout: "100ms"
 dashmate_platform_drive_tenderdash_p2p_max_packet_msg_payload_size: 10240
 dashmate_platform_drive_tenderdash_p2p_send_rate: 5120000
 dashmate_platform_drive_tenderdash_p2p_recv_rate: 5120000
+dashmate_platform_drive_tenderdash_p2p_max_connections: 64
+dashmate_platform_drive_tenderdash_p2p_max_outgoing_connections: 30
 dashmate_platform_drive_tenderdash_mempool_size: 5000
 dashmate_platform_drive_tenderdash_mempool_cache_size: 10000
 dashmate_platform_drive_tenderdash_mempool_max_txs_bytes: 536870912 # 500Mb, default: 1073741824

diff --git a/ansible/roles/dashmate/templates/dashmate.json.j2 b/ansible/roles/dashmate/templates/dashmate.json.j2
@@ -182,10 +182,10 @@
             "dapiAndDrive": {
               "host": "0.0.0.0",
               "port": {{ gateway_port }},
-              "waitForStResultTimeout": "125s",
               "http2": {
                 "maxConcurrentStreams": {{ dashmate_platform_gateway_listeners_dapi_and_drive_http2_max_concurrent_streams }}
-              }
+              },
+              "waitForStResultTimeout": "{{ dashmate_platform_gateway_listeners_dapi_and_drive_wait_for_st_result_timeout }}"
             }
           },
           "rateLimiter": {
@@ -241,7 +241,7 @@
                 "target": ""
               }
             },
-            "waitForStResultTimeout": 120000
+            "waitForStResultTimeout": {{ dashmate_platform_dapi_api_wait_for_st_result_timeout }}
           }
         },
         "drive": {
@@ -347,7 +347,9 @@
               "flushThrottleTimeout": "{{dashmate_platform_drive_tenderdash_p2p_flush_throttle_timeout}}",
               "maxPacketMsgPayloadSize": {{dashmate_platform_drive_tenderdash_p2p_max_packet_msg_payload_size}},
               "sendRate": {{dashmate_platform_drive_tenderdash_p2p_send_rate}},
-              "recvRate": {{dashmate_platform_drive_tenderdash_p2p_recv_rate}}
+              "recvRate": {{dashmate_platform_drive_tenderdash_p2p_recv_rate}},
+              "maxConnections": {{dashmate_platform_drive_tenderdash_p2p_max_connections}},
+              "maxOutgoingConnections": {{dashmate_platform_drive_tenderdash_p2p_max_outgoing_connections}}
             },
             "mempool": {
               "cacheSize": {{dashmate_platform_drive_tenderdash_mempool_cache_size}},