Skip to content

Fix WorkerInstanceKey not forwarded between task queue partitions #9214

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
rkannan82 merged 3 commits into from
Feb 6, 2026
Merged

Fix WorkerInstanceKey not forwarded between task queue partitions #9214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07def54
Fix WorkerInstanceKey not forwarded between task queue partitions
rkannan82 Feb 4, 2026
38d35eb
Fix lint
rkannan82 Feb 6, 2026
a7c0437
fix lint
rkannan82 Feb 6, 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
3 changes: 3 additions & 0 deletions service/matching/forwarder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ func (fwdr *Forwarder) ForwardPoll(ctx context.Context, pollMetadata *pollMetada
Identity: identity,
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
DeploymentOptions: pollMetadata.deploymentOptions,
WorkerInstanceKey: pollMetadata.workerInstanceKey,
},
ForwardedSource: fwdr.partition.RpcName(),
Conditions: pollMetadata.conditions,
Expand All @@ -271,6 +272,7 @@ func (fwdr *Forwarder) ForwardPoll(ctx context.Context, pollMetadata *pollMetada
TaskQueueMetadata: pollMetadata.taskQueueMetadata,
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
DeploymentOptions: pollMetadata.deploymentOptions,
WorkerInstanceKey: pollMetadata.workerInstanceKey,
},
ForwardedSource: fwdr.partition.RpcName(),
Conditions: pollMetadata.conditions,
Expand All @@ -293,6 +295,7 @@ func (fwdr *Forwarder) ForwardPoll(ctx context.Context, pollMetadata *pollMetada
Identity: identity,
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
DeploymentOptions: pollMetadata.deploymentOptions,
WorkerInstanceKey: pollMetadata.workerInstanceKey,
// Namespace is ignored here.
},
ForwardedSource: fwdr.partition.RpcName(),
Expand Down
89 changes: 88 additions & 1 deletion service/matching/forwarder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/google/uuid"
"github.com/stretchr/testify/suite"
enumspb "go.temporal.io/api/enums/v1"
"go.temporal.io/api/workflowservice/v1"
enumsspb "go.temporal.io/server/api/enums/v1"
"go.temporal.io/server/api/matchingservice/v1"
"go.temporal.io/server/api/matchingservicemock/v1"
Expand Down Expand Up @@ -282,6 +283,34 @@ func (t *ForwarderTestSuite) TestForwardPollWorkflowTaskQueue() {
t.Nil(task.pollActivityTaskQueueResponse())
}

func (t *ForwarderTestSuite) TestForwardPollWorkflowTaskQueuePreservesWorkerInstanceKey() {
t.usingTaskqueuePartition(enumspb.TASK_QUEUE_TYPE_WORKFLOW)

pollerID := uuid.NewString()
workerInstanceKey := "test-worker-instance-" + uuid.NewString()
ctx := context.WithValue(context.Background(), pollerIDKey, pollerID)
ctx = context.WithValue(ctx, identityKey, "id1")
resp := &matchingservice.PollWorkflowTaskQueueResponse{
TaskToken: []byte("token1"),
}

var request *matchingservice.PollWorkflowTaskQueueRequest
t.client.EXPECT().PollWorkflowTaskQueue(gomock.Any(), gomock.Any(), gomock.Any()).Do(
func(arg0 context.Context, arg1 *matchingservice.PollWorkflowTaskQueueRequest, arg2 ...interface{}) {
request = arg1
},
).Return(resp, nil)

task, err := t.fwdr.ForwardPoll(ctx, &pollMetadata{
workerInstanceKey: workerInstanceKey,
})
t.Require().NoError(err)
t.NotNil(task)
t.NotNil(request)
t.Equal(workerInstanceKey, request.GetPollRequest().GetWorkerInstanceKey(),
"WorkerInstanceKey should be preserved when forwarding workflow poll")
}

func (t *ForwarderTestSuite) TestForwardPollForActivity() {
t.usingTaskqueuePartition(enumspb.TASK_QUEUE_TYPE_ACTIVITY)

Expand All @@ -300,7 +329,7 @@ func (t *ForwarderTestSuite) TestForwardPollForActivity() {
).Return(resp, nil)

task, err := t.fwdr.ForwardPoll(ctx, &pollMetadata{})
t.NoError(err)
t.Require().NoError(err)
t.NotNil(task)
t.NotNil(request)
t.Equal(pollerID, request.GetPollerId())
Expand All @@ -312,6 +341,64 @@ func (t *ForwarderTestSuite) TestForwardPollForActivity() {
t.Nil(task.pollWorkflowTaskQueueResponse())
}

func (t *ForwarderTestSuite) TestForwardPollForActivityPreservesWorkerInstanceKey() {
t.usingTaskqueuePartition(enumspb.TASK_QUEUE_TYPE_ACTIVITY)

pollerID := uuid.NewString()
workerInstanceKey := "test-worker-instance-" + uuid.NewString()
ctx := context.WithValue(context.Background(), pollerIDKey, pollerID)
ctx = context.WithValue(ctx, identityKey, "id1")
resp := &matchingservice.PollActivityTaskQueueResponse{
TaskToken: []byte("token1"),
}

var request *matchingservice.PollActivityTaskQueueRequest
t.client.EXPECT().PollActivityTaskQueue(gomock.Any(), gomock.Any(), gomock.Any()).Do(
func(arg0 context.Context, arg1 *matchingservice.PollActivityTaskQueueRequest, arg2 ...interface{}) {
request = arg1
},
).Return(resp, nil)

task, err := t.fwdr.ForwardPoll(ctx, &pollMetadata{
workerInstanceKey: workerInstanceKey,
})
t.Require().NoError(err)
t.NotNil(task)
t.NotNil(request)
t.Equal(workerInstanceKey, request.GetPollRequest().GetWorkerInstanceKey(),
"WorkerInstanceKey should be preserved when forwarding activity poll")
}

func (t *ForwarderTestSuite) TestForwardPollForNexusPreservesWorkerInstanceKey() {
t.usingTaskqueuePartition(enumspb.TASK_QUEUE_TYPE_NEXUS)

pollerID := uuid.NewString()
workerInstanceKey := "test-worker-instance-" + uuid.NewString()
ctx := context.WithValue(context.Background(), pollerIDKey, pollerID)
ctx = context.WithValue(ctx, identityKey, "id1")
resp := &matchingservice.PollNexusTaskQueueResponse{
Response: &workflowservice.PollNexusTaskQueueResponse{
TaskToken: []byte("token1"),
},
}

var request *matchingservice.PollNexusTaskQueueRequest
t.client.EXPECT().PollNexusTaskQueue(gomock.Any(), gomock.Any(), gomock.Any()).Do(
func(arg0 context.Context, arg1 *matchingservice.PollNexusTaskQueueRequest, arg2 ...interface{}) {
request = arg1
},
).Return(resp, nil)

task, err := t.fwdr.ForwardPoll(ctx, &pollMetadata{
workerInstanceKey: workerInstanceKey,
})
t.Require().NoError(err)
t.NotNil(task)
t.NotNil(request)
t.Equal(workerInstanceKey, request.GetRequest().GetWorkerInstanceKey(),
"WorkerInstanceKey should be preserved when forwarding Nexus poll")
}

// TODO(pri): old matcher cleanup
func (t *ForwarderTestSuite) TestMaxOutstandingConcurrency() {
if t.newFwdr {
Expand Down
4 changes: 4 additions & 0 deletions service/matching/matching_engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ type (
conditions *matchingservice.PollConditions
forwardedFrom string
localPollStartTime time.Time
workerInstanceKey string
}

userDataUpdate struct {
Expand Down Expand Up @@ -638,6 +639,7 @@ pollLoop:
deploymentOptions: request.DeploymentOptions,
forwardedFrom: req.ForwardedSource,
conditions: req.Conditions,
workerInstanceKey: request.WorkerInstanceKey,
}
task, versionSetUsed, err := e.pollTask(pollerCtx, partition, pollMetadata)
if err != nil {
Expand Down Expand Up @@ -942,6 +944,7 @@ pollLoop:
deploymentOptions: request.DeploymentOptions,
forwardedFrom: req.ForwardedSource,
conditions: req.Conditions,
workerInstanceKey: request.WorkerInstanceKey,
}
task, versionSetUsed, err := e.pollTask(pollerCtx, partition, pollMetadata)
if err != nil {
Expand Down Expand Up @@ -2495,6 +2498,7 @@ pollLoop:
deploymentOptions: request.DeploymentOptions,
forwardedFrom: req.ForwardedSource,
conditions: req.Conditions,
workerInstanceKey: request.WorkerInstanceKey,
}
task, _, err := e.pollTask(pollerCtx, partition, pollMetadata)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions service/matching/pri_forwarder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ func ForwardPollWithTarget(
Identity: identity,
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
DeploymentOptions: pollMetadata.deploymentOptions,
WorkerInstanceKey: pollMetadata.workerInstanceKey,
},
ForwardedSource: source.RpcName(),
Conditions: pollMetadata.conditions,
Expand All @@ -241,6 +242,7 @@ func ForwardPollWithTarget(
TaskQueueMetadata: pollMetadata.taskQueueMetadata,
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
DeploymentOptions: pollMetadata.deploymentOptions,
WorkerInstanceKey: pollMetadata.workerInstanceKey,
},
ForwardedSource: source.RpcName(),
Conditions: pollMetadata.conditions,
Expand All @@ -263,6 +265,7 @@ func ForwardPollWithTarget(
Identity: identity,
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
DeploymentOptions: pollMetadata.deploymentOptions,
WorkerInstanceKey: pollMetadata.workerInstanceKey,
// Namespace is ignored here.
},
ForwardedSource: source.RpcName(),
Expand Down
Loading