Default to multiple TaskQueue partitions in FrontEnd LoadBalancer configs (#639)

Mark Markaryan · web-flow · commit 58f95bc041aa · 2020-07-30T15:19:09.000-07:00
diff --git a/client/matching/loadbalancer.go b/client/matching/loadbalancer.go
@@ -83,8 +83,10 @@ func NewLoadBalancer(
 ) LoadBalancer {
 	return &defaultLoadBalancer{
 		namespaceIDToName: namespaceIDToName,
-		nReadPartitions:   dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingNumTaskqueueReadPartitions, 1),
-		nWritePartitions:  dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingNumTaskqueueWritePartitions, 1),
+		nReadPartitions: dc.GetIntPropertyFilteredByTaskQueueInfo(
+			dynamicconfig.MatchingNumTaskqueueReadPartitions, dynamicconfig.DefaultNumTaskQueuePartitions),
+		nWritePartitions: dc.GetIntPropertyFilteredByTaskQueueInfo(
+			dynamicconfig.MatchingNumTaskqueueWritePartitions, dynamicconfig.DefaultNumTaskQueuePartitions),
 	}
 }
 
diff --git a/common/service/dynamicconfig/constants.go b/common/service/dynamicconfig/constants.go
@@ -818,6 +818,8 @@ const (
 	lastFilterTypeForTest
 )
 
+const DefaultNumTaskQueuePartitions = 4
+
 // FilterOption is used to provide filters for dynamic config keys
 type FilterOption func(filterMap map[Filter]interface{})
 
diff --git a/service/matching/config.go b/service/matching/config.go
@@ -111,8 +111,8 @@ func NewConfig(dc *dynamicconfig.Collection) *Config {
 		OutstandingTaskAppendsThreshold: dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingOutstandingTaskAppendsThreshold, 250),
 		MaxTaskBatchSize:                dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingMaxTaskBatchSize, 100),
 		ThrottledLogRPS:                 dc.GetIntProperty(dynamicconfig.MatchingThrottledLogRPS, 20),
-		NumTaskqueueWritePartitions:     dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingNumTaskqueueWritePartitions, 4),
-		NumTaskqueueReadPartitions:      dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingNumTaskqueueReadPartitions, 4),
+		NumTaskqueueWritePartitions:     dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingNumTaskqueueWritePartitions, dynamicconfig.DefaultNumTaskQueuePartitions),
+		NumTaskqueueReadPartitions:      dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingNumTaskqueueReadPartitions, dynamicconfig.DefaultNumTaskQueuePartitions),
 		ForwarderMaxOutstandingPolls:    dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingForwarderMaxOutstandingPolls, 1),
 		ForwarderMaxOutstandingTasks:    dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingForwarderMaxOutstandingTasks, 1),
 		ForwarderMaxRatePerSecond:       dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingForwarderMaxRatePerSecond, 10),

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,10 @@ func NewLoadBalancer(`
`83`	`83`	`) LoadBalancer {`
`84`	`84`	`return &defaultLoadBalancer{`
`85`	`85`	`namespaceIDToName: namespaceIDToName,`
`86`		`- nReadPartitions: dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingNumTaskqueueReadPartitions, 1),`
`87`		`- nWritePartitions: dc.GetIntPropertyFilteredByTaskQueueInfo(dynamicconfig.MatchingNumTaskqueueWritePartitions, 1),`
	`86`	`+ nReadPartitions: dc.GetIntPropertyFilteredByTaskQueueInfo(`
	`87`	`+ dynamicconfig.MatchingNumTaskqueueReadPartitions, dynamicconfig.DefaultNumTaskQueuePartitions),`
	`88`	`+ nWritePartitions: dc.GetIntPropertyFilteredByTaskQueueInfo(`
	`89`	`+ dynamicconfig.MatchingNumTaskqueueWritePartitions, dynamicconfig.DefaultNumTaskQueuePartitions),`
`88`	`90`	`}`
`89`	`91`	`}`
`90`	`92`
Original file line number	Diff line number	Diff line change
`@@ -818,6 +818,8 @@ const (`
`818`	`818`	`lastFilterTypeForTest`
`819`	`819`	`)`
`820`	`820`
	`821`	`+const DefaultNumTaskQueuePartitions = 4`
	`822`	`+`
`821`	`823`	`// FilterOption is used to provide filters for dynamic config keys`
`822`	`824`	`type FilterOption func(filterMap map[Filter]interface{})`
`823`	`825`