pkg/settings/cresettings: restore and reconfigure Workflow[ExecutionConcurrency]Limits (#1943)

Author: jmank88

pkg/settings/cresettings/README.md

@@ -46,7 +46,6 @@ flowchart
         GatewayHTTPGlobalRate[\GatewayHTTPGlobalRate/]:::rate
         GatewayHTTPPerNodeRate[\GatewayHTTPPerNodeRate/]:::rate
     end
-%%    WorkflowLimit - Deprecated
 %%    TODO unused
 %%    PerOrg.ZeroBalancePruningTimeout
 
@@ -61,10 +60,11 @@ flowchart
     end
     
     subgraph Engine.init
-        WorkflowExecutionConcurrencyLimit([WorkflowExecutionConcurrencyLimit]):::resource
-        PerOwner.WorkflowExecutionConcurrencyLimit([PerOwner.WorkflowExecutionConcurrencyLimit]):::resource
+%%        TODO move and replace with WorkflowLimit
+        WorkflowLimit([WorkflowLimit]):::resource
+        PerOwner.WorkflowLimit([PerOwner.WorkflowLimit]):::resource
 
-        WorkflowExecutionConcurrencyLimit-->PerOwner.WorkflowExecutionConcurrencyLimit
+        WorkflowLimit-->PerOwner.WorkflowLimit
     end
     
     subgraph Engine.runTriggerSubscriptionPhase
@@ -103,9 +103,16 @@ flowchart
     subgraph Engine.handleAllTriggerEvents
         PerWorkflow.TriggerEventQueueLimit[[PerWorkflow.TriggerEventQueueLimit]]:::queue
         PerWorkflow.TriggerEventQueueTimeout>PerWorkflow.TriggerEventQueueTimeout]:::time
-        PerWorkflow.ExecutionConcurrencyLimit([PerWorkflow.ExecutionConcurrencyLimit]):::resource
+        
+        subgraph multiExecutionConcurrencyLimiter
+            WorkflowExecutionConcurrencyLimit([WorkflowExecutionConcurrencyLimit]):::resource
+            PerOrg.WorkflowExecutionConcurrencyLimit([PerOrg.WorkflowExecutionConcurrencyLimit]):::resource
+            PerOwner.WorkflowExecutionConcurrencyLimit([PerOwner.WorkflowExecutionConcurrencyLimit]):::resource
+            PerWorkflow.ExecutionConcurrencyLimit([PerWorkflow.ExecutionConcurrencyLimit]):::resource
+            WorkflowExecutionConcurrencyLimit-->PerOrg.WorkflowExecutionConcurrencyLimit-->PerOwner.WorkflowExecutionConcurrencyLimit-->PerWorkflow.ExecutionConcurrencyLimit
+        end
 
-        PerWorkflow.TriggerEventQueueLimit-->PerWorkflow.TriggerEventQueueTimeout-->PerWorkflow.ExecutionConcurrencyLimit
+        PerWorkflow.TriggerEventQueueLimit-->PerWorkflow.TriggerEventQueueTimeout-->multiExecutionConcurrencyLimiter
     end
 
     subgraph Engine.startExecution

pkg/settings/cresettings/defaults.json

@@ -1,6 +1,6 @@
 {
-	"WorkflowLimit": "200",
-	"WorkflowExecutionConcurrencyLimit": "200",
+	"WorkflowLimit": "1000",
+	"WorkflowExecutionConcurrencyLimit": "1000",
 	"GatewayIncomingPayloadSizeLimit": "1mb",
 	"GatewayVaultManagementEnabled": "true",
 	"VaultJWTAuthEnabled": "false",
@@ -29,9 +29,11 @@
 	"VaultMaxPerOracleUnexpiredBlobCumulativePayloadSizeLimit": "31.45728mb",
 	"VaultMaxPerOracleUnexpiredBlobCount": "1000",
 	"PerOrg": {
+		"WorkflowExecutionConcurrencyLimit": "100",
 		"ZeroBalancePruningTimeout": "24h0m0s"
 	},
 	"PerOwner": {
+		"WorkflowLimit": "1000",
 		"WorkflowExecutionConcurrencyLimit": "5",
 		"VaultSecretsLimit": "100"
 	},

pkg/settings/cresettings/defaults.toml

@@ -1,5 +1,5 @@
-WorkflowLimit = '200'
-WorkflowExecutionConcurrencyLimit = '200'
+WorkflowLimit = '1000'
+WorkflowExecutionConcurrencyLimit = '1000'
 GatewayIncomingPayloadSizeLimit = '1mb'
 GatewayVaultManagementEnabled = 'true'
 VaultJWTAuthEnabled = 'false'
@@ -29,9 +29,11 @@ VaultMaxPerOracleUnexpiredBlobCumulativePayloadSizeLimit = '31.45728mb'
 VaultMaxPerOracleUnexpiredBlobCount = '1000'
 
 [PerOrg]
+WorkflowExecutionConcurrencyLimit = '100'
 ZeroBalancePruningTimeout = '24h0m0s'
 
 [PerOwner]
+WorkflowLimit = '1000'
 WorkflowExecutionConcurrencyLimit = '5'
 VaultSecretsLimit = '100'
 

pkg/settings/cresettings/settings.go

@@ -52,8 +52,8 @@ var DefaultGetter Getter
 var Config Schema
 
 var Default = Schema{
-	WorkflowLimit:                          Int(200),
-	WorkflowExecutionConcurrencyLimit:      Int(200),
+	WorkflowLimit:                          Int(1000),
+	WorkflowExecutionConcurrencyLimit:      Int(1000),
 	GatewayIncomingPayloadSizeLimit:        Size(1 * config.MByte),
 	GatewayVaultManagementEnabled:          Bool(true),
 	VaultJWTAuthEnabled:                    Bool(false),
@@ -118,9 +118,11 @@ var Default = Schema{
 	VaultMaxPerOracleUnexpiredBlobCount:                      Int(1000),
 
 	PerOrg: Orgs{
-		ZeroBalancePruningTimeout: Duration(24 * time.Hour),
+		WorkflowExecutionConcurrencyLimit: Int(100),
+		ZeroBalancePruningTimeout:         Duration(24 * time.Hour),
 	},
 	PerOwner: Owners{
+		WorkflowLimit:                     Int(1000),
 		WorkflowExecutionConcurrencyLimit: Int(5),
 
 		// DANGER(cedric): Be extremely careful changing this vault limit as it acts as a default value
@@ -227,7 +229,7 @@ var Default = Schema{
 }
 
 type Schema struct {
-	WorkflowLimit                          Setting[int] `unit:"{workflow}"` // Deprecated
+	WorkflowLimit                          Setting[int] `unit:"{workflow}"`
 	WorkflowExecutionConcurrencyLimit      Setting[int] `unit:"{workflow}"`
 	GatewayIncomingPayloadSizeLimit        Setting[config.Size]
 	GatewayVaultManagementEnabled          Setting[bool]
@@ -265,10 +267,12 @@ type Schema struct {
 	PerWorkflow Workflows `scope:"workflow"`
 }
 type Orgs struct {
-	ZeroBalancePruningTimeout Setting[time.Duration]
+	WorkflowExecutionConcurrencyLimit Setting[int] `unit:"{workflow}"`
+	ZeroBalancePruningTimeout         Setting[time.Duration]
 }
 
 type Owners struct {
+	WorkflowLimit                     Setting[int] `unit:"{workflow}"`
 	WorkflowExecutionConcurrencyLimit Setting[int] `unit:"{workflow}"`
 	VaultSecretsLimit                 Setting[int] `unit:"{secret}"`
 }