handle max poller setting correctly

Author: shijiesheng

internal/internal_worker.go

@@ -276,9 +276,13 @@ func newWorkflowTaskWorkerInternal(
 		domain,
 		params,
 	)
+	pollerCount := params.MaxConcurrentDecisionTaskPollers
+	if params.AutoScalerOptions.Enabled {
+		pollerCount = params.AutoScalerOptions.PollerMaxCount
+	}
 	worker := newBaseWorker(baseWorkerOptions{
 		pollerAutoScaler:  params.AutoScalerOptions,
-		pollerCount:       params.MaxConcurrentDecisionTaskPollers,
+		pollerCount:       pollerCount,
 		pollerRate:        defaultPollerRate,
 		maxConcurrentTask: params.MaxConcurrentDecisionTaskExecutionSize,
 		maxTaskPerSecond:  params.WorkerDecisionTasksPerSecond,
@@ -468,10 +472,14 @@ func newActivityTaskWorker(
 	workerType string,
 ) (worker *activityWorker) {
 	ensureRequiredParams(&workerParams)
+	pollerCount := workerParams.MaxConcurrentActivityTaskPollers
+	if workerParams.AutoScalerOptions.Enabled {
+		pollerCount = workerParams.AutoScalerOptions.PollerMaxCount
+	}
 	base := newBaseWorker(
 		baseWorkerOptions{
 			pollerAutoScaler:  workerParams.AutoScalerOptions,
-			pollerCount:       workerParams.MaxConcurrentActivityTaskPollers,
+			pollerCount:       pollerCount,
 			pollerRate:        defaultPollerRate,
 			maxConcurrentTask: workerParams.MaxConcurrentActivityExecutionSize,
 			maxTaskPerSecond:  workerParams.WorkerActivitiesPerSecond,

internal/worker.go

@@ -81,14 +81,15 @@ type (
 		// cadence-server to retrieve activity tasks. Changing this value will affect the
 		// rate at which the worker is able to consume tasks from a task list.
 		// Default value is 2
+		// NOTE: if AutoScalerOptions.Enabled is set to true, this value will be ignored and AutoScalerOptions.PollerMaxCount will be used instead
 		MaxConcurrentActivityTaskPollers int
 
 		// optional: Sets the minimum number of goroutines that will concurrently poll the
 		// cadence-server to retrieve activity tasks. Changing this value will NOT affect the
 		// rate at which the worker is able to consume tasks from a task list,
 		// unless FeatureFlags.PollerAutoScalerEnabled is set to true.
 		// Default value is 1
-		// Deprecated: Use AutoScalerOptions instead.
+		// Deprecated: No effect and use AutoScalerOptions instead.
 		MinConcurrentActivityTaskPollers int
 
 		// Optional: To set the maximum concurrent decision task executions this worker can have.
@@ -105,13 +106,14 @@ type (
 		// cadence-server to retrieve decision tasks. Changing this value will affect the
 		// rate at which the worker is able to consume tasks from a task list.
 		// Default value is 2
+		// NOTE: if AutoScalerOptions.Enabled is set to true, this value will be ignored and AutoScalerOptions.PollerMaxCount will be used instead
 		MaxConcurrentDecisionTaskPollers int
 
 		// optional: Sets the minimum number of goroutines that will concurrently poll the
 		// cadence-server to retrieve decision tasks. If FeatureFlags.PollerAutoScalerEnabled is set to true,
 		// changing this value will NOT affect the rate at which the worker is able to consume tasks from a task list.
 		// Default value is 2
-		// Deprecated: Use AutoScalerOptions instead.
+		// Deprecated: NO effect and use AutoScalerOptions instead.
 		MinConcurrentDecisionTaskPollers int
 
 		// optional: Sets the interval of poller autoscaling, between which poller autoscaler changes the poller count