Run one per-ns worker per namespace instead of namespace × component (#…

…3116)

common/dynamicconfig/constants.go

@@ -630,10 +630,10 @@ const (
 	WorkerParentCloseMaxConcurrentActivityTaskPollers = "worker.ParentCloseMaxConcurrentActivityTaskPollers"
 	// WorkerParentCloseMaxConcurrentWorkflowTaskPollers indicates worker parent close worker max concurrent workflow pollers
 	WorkerParentCloseMaxConcurrentWorkflowTaskPollers = "worker.ParentCloseMaxConcurrentWorkflowTaskPollers"
+	// WorkerPerNamespaceWorkerCount controls number of per-ns (scheduler, batcher, etc.) workers to run per namespace
+	WorkerPerNamespaceWorkerCount = "worker.perNamespaceWorkerCount"
 	// WorkerEnableScheduler controls whether to start the worker for scheduled workflows
 	WorkerEnableScheduler = "worker.enableScheduler"
-	// WorkerSchedulerNumWorkers controls number of scheduler workers to run per namespace
-	WorkerSchedulerNumWorkers = "worker.schedulerNumWorkers"
 )
 
 // Filter represents a filter on the dynamic config key

service/frontend/workflowHandler.go

@@ -72,6 +72,7 @@ import (
 	"go.temporal.io/server/common/primitives/timestamp"
 	"go.temporal.io/server/common/rpc/interceptor"
 	"go.temporal.io/server/common/searchattribute"
+	workercommon "go.temporal.io/server/service/worker/common"
 	"go.temporal.io/server/service/worker/scheduler"
 )
 
@@ -3128,7 +3129,7 @@ func (wh *WorkflowHandler) CreateSchedule(ctx context.Context, request *workflow
 		Namespace:             request.Namespace,
 		WorkflowId:            request.ScheduleId,
 		WorkflowType:          &commonpb.WorkflowType{Name: scheduler.WorkflowType},
-		TaskQueue:             &taskqueuepb.TaskQueue{Name: scheduler.TaskQueueName},
+		TaskQueue:             &taskqueuepb.TaskQueue{Name: workercommon.PerNSWorkerTaskQueue},
 		Input:                 inputPayload,
 		Identity:              request.Identity,
 		RequestId:             request.RequestId,

service/worker/common/interface.go

@@ -31,6 +31,11 @@ import (
 	"go.temporal.io/server/common/namespace"
 )
 
+const (
+	// All per-ns workers share one task queue
+	PerNSWorkerTaskQueue = "temporal-sys-per-ns-tq"
+)
+
 type (
 	// WorkerComponent represents a type of work needed for worker role
 	WorkerComponent interface {
@@ -60,13 +65,7 @@ type (
 	}
 
 	PerNSDedicatedWorkerOptions struct {
-		// Set this to false to disable a worker for this namespace
+		// Set this to false to disable this worker for this namespace
 		Enabled bool
-		// TaskQueue is required
-		TaskQueue string
-		// How many worker nodes should run a worker per namespace
-		NumWorkers int
-		// Other worker options
-		Options sdkworker.Options
 	}
 )