Skip to content

Set task poller type for scalable task pollers #2248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuandrew merged 4 commits into from
Apr 29, 2026
+100 −17
Merged

Set task poller type for scalable task pollers #2248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ef2a79
Set task poller type for scalable task pollers
kritibehl Mar 23, 2026
c223de1
Merge branch 'main' into fix-task-poller-type-2235
yuandrew Apr 29, 2026
23f7e16
ci: rerun failed macos-arm integration test
kritibehl Apr 29, 2026
7981661
Merge branch 'main' into fix-task-poller-type-2235
yuandrew Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion internal/internal_nexus_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package internal
import (
"github.com/nexus-rpc/sdk-go/nexus"
"go.temporal.io/api/workflowservice/v1"
"go.temporal.io/sdk/internal/common/metrics"
)

type nexusWorkerOptions struct {
Expand Down Expand Up @@ -51,7 +52,9 @@ func newNexusWorker(opts nexusWorkerOptions) (*nexusWorker, error) {
poller,
opts.executionParameters.Logger,
params.NexusTaskPollerBehavior,
params.serverSupportsAutoscaling),
metrics.PollerTypeNexusTask,
params.serverSupportsAutoscaling,
),
},
taskProcessor: poller,
workerType: "NexusWorker",
Expand Down
47 changes: 38 additions & 9 deletions internal/internal_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,37 @@ func newWorkflowTaskWorkerInternal(
switch params.WorkflowTaskPollerBehavior.(type) {
case *pollerBehaviorSimpleMaximum:
scalableTaskPollers = []scalableTaskPoller{
newScalableTaskPoller(taskProcessor.createPoller(Mixed), params.Logger, params.WorkflowTaskPollerBehavior, params.serverSupportsAutoscaling),
newScalableTaskPoller(
taskProcessor.createPoller(Mixed),
params.Logger,
params.WorkflowTaskPollerBehavior,
metrics.PollerTypeWorkflowTask,
params.serverSupportsAutoscaling,
),
}

case *pollerBehaviorAutoscaling:
scalableTaskPollers = []scalableTaskPoller{
newScalableTaskPoller(taskProcessor.createPoller(NonSticky), params.Logger, params.WorkflowTaskPollerBehavior, params.serverSupportsAutoscaling),
newScalableTaskPoller(
taskProcessor.createPoller(NonSticky),
params.Logger,
params.WorkflowTaskPollerBehavior,
metrics.PollerTypeWorkflowTask,
params.serverSupportsAutoscaling,
),
}

if taskProcessor.stickyCacheSize > 0 {
scalableTaskPollers = append(scalableTaskPollers, newScalableTaskPoller(taskProcessor.createPoller(Sticky), params.Logger, params.WorkflowTaskPollerBehavior, params.serverSupportsAutoscaling))
scalableTaskPollers = append(
scalableTaskPollers,
newScalableTaskPoller(
taskProcessor.createPoller(Sticky),
params.Logger,
params.WorkflowTaskPollerBehavior,
metrics.PollerTypeWorkflowStickyTask,
params.serverSupportsAutoscaling,
),
)
}
}

Expand Down Expand Up @@ -394,11 +417,17 @@ func newWorkflowTaskWorkerInternal(
slotSupplier: laParams.Tuner.GetLocalActivitySlotSupplier(),
maxTaskPerSecond: laParams.WorkerLocalActivitiesPerSecond,
taskPollers: []scalableTaskPoller{
newScalableTaskPoller(localActivityTaskPoller, params.Logger, NewPollerBehaviorSimpleMaximum(
PollerBehaviorSimpleMaximumOptions{
MaximumNumberOfPollers: 2,
},
), params.serverSupportsAutoscaling),
newScalableTaskPoller(
localActivityTaskPoller,
params.Logger,
NewPollerBehaviorSimpleMaximum(
PollerBehaviorSimpleMaximumOptions{
MaximumNumberOfPollers: 2,
},
),
"",
nil,
),
},
taskProcessor: localActivityTaskPoller,
workerType: "LocalActivityWorker",
Expand Down Expand Up @@ -549,7 +578,7 @@ func newActivityWorker(
slotSupplier: slotSupplier,
maxTaskPerSecond: params.WorkerActivitiesPerSecond,
taskPollers: []scalableTaskPoller{
newScalableTaskPoller(poller, params.Logger, params.ActivityTaskPollerBehavior, params.serverSupportsAutoscaling),
newScalableTaskPoller(poller, params.Logger, params.ActivityTaskPollerBehavior, metrics.PollerTypeActivityTask, params.serverSupportsAutoscaling),
},
taskProcessor: poller,
workerType: "ActivityWorker",
Expand Down
10 changes: 8 additions & 2 deletions internal/internal_worker_base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,9 +889,15 @@ func (ps *pollerSemaphore) updatePermits(maxPermits int) {
}

func newScalableTaskPoller(
poller taskPoller, logger log.Logger, pollerBehavior PollerBehavior, serverSupportsAutoscaling *atomic.Bool) scalableTaskPoller {
poller taskPoller,
logger log.Logger,
pollerBehavior PollerBehavior,
taskPollerType string,
serverSupportsAutoscaling *atomic.Bool,
) scalableTaskPoller {
tw := scalableTaskPoller{
taskPoller: poller,
taskPoller: poller,
taskPollerType: taskPollerType,
}
switch p := pollerBehavior.(type) {
case *pollerBehaviorAutoscaling:
Expand Down
55 changes: 50 additions & 5 deletions internal/internal_worker_base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,24 @@ type (
}
)

func (s *ScalableTaskPollerSuite) TestNewScalableTaskPollerSetsTaskPollerType() {
Copy link
Copy Markdown
Contributor

@yuandrew yuandrew Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also include a test that verifies each poller type matches the poller (i.e. sticky workflow poller actually gets PollerTypeworkflowStickyTask) for each type?

Copy link
Copy Markdown
Contributor Author

@kritibehl kritibehl Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added TestNewScalableTaskPollerAllTypes covering workflow, sticky, activity and nexus types.

behavior := NewPollerBehaviorSimpleMaximum(
PollerBehaviorSimpleMaximumOptions{
MaximumNumberOfPollers: 1,
},
)

blockingPoller := newSemaphoreProbeTaskPoller()
poller := newScalableTaskPoller(
blockingPoller,
ilog.NewNopLogger(),
behavior,
metrics.PollerTypeWorkflowStickyTask,
&atomic.Bool{},
)

s.Equal(metrics.PollerTypeWorkflowStickyTask, poller.taskPollerType)
}
func TestScalableTaskPollerSuite(t *testing.T) {
suite.Run(t, new(ScalableTaskPollerSuite))
}
Expand Down Expand Up @@ -140,9 +158,7 @@ func (s *ScalableTaskPollerSuite) TestAutoscalingConcurrencyScalesUpToMaximum()
}

blockingPoller := newSemaphoreProbeTaskPoller()
poller := newScalableTaskPoller(blockingPoller, ilog.NewNopLogger(), behavior, nil)
poller.taskPollerType = "test"

poller := newScalableTaskPoller(blockingPoller, ilog.NewNopLogger(), behavior, "", nil)
bw := newBaseWorker(baseWorkerOptions{
slotSupplier: &testSlotSupplier{},
maxTaskPerSecond: 1000,
Expand Down Expand Up @@ -188,8 +204,7 @@ func (s *ScalableTaskPollerSuite) TestAutoscalingScalesDownToMinimum() {
}

blockingPoller := newSemaphoreProbeTaskPoller()
poller := newScalableTaskPoller(blockingPoller, ilog.NewNopLogger(), behavior, nil)
poller.taskPollerType = "test"
poller := newScalableTaskPoller(blockingPoller, ilog.NewNopLogger(), behavior, "", nil)

bw := newBaseWorker(baseWorkerOptions{
slotSupplier: &testSlotSupplier{},
Expand Down Expand Up @@ -470,3 +485,33 @@ func TestPollerBalancerBlocksWhenOtherTypeHasNoPollers(t *testing.T) {
}
}

func (s *ScalableTaskPollerSuite) TestNewScalableTaskPollerAllTypes() {
behavior := NewPollerBehaviorSimpleMaximum(
PollerBehaviorSimpleMaximumOptions{
MaximumNumberOfPollers: 1,
},
)

cases := []struct {
name string
ptype string
}{
{"workflow", metrics.PollerTypeWorkflowTask},
{"workflow-sticky", metrics.PollerTypeWorkflowStickyTask},
{"activity", metrics.PollerTypeActivityTask},
{"nexus", metrics.PollerTypeNexusTask},
}

for _, tc := range cases {
s.Run(tc.name, func() {
poller := newScalableTaskPoller(
newSemaphoreProbeTaskPoller(),
ilog.NewNopLogger(),
behavior,
tc.ptype,
&atomic.Bool{},
)
s.Equal(tc.ptype, poller.taskPollerType)
})
}
}