Skip to content

Commit 5390759

Browse files
committed
Forward WorkerControlTaskQueue through matching service partitions
1 parent 0f8e48e commit 5390759

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,4 @@ require (
174174
modernc.org/memory v1.11.0 // indirect
175175
)
176176

177-
replace go.temporal.io/api => /Users/krajah/Code/api-go
177+
replace go.temporal.io/api => github.com/temporalio/api-go v1.62.2-0.20260217225453-e6a9241288b9

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
236236
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
237237
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
238238
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
239-
github.com/nexus-rpc/sdk-go v0.5.1 h1:UFYYfoHlQc+Pn9gQpmn9QE7xluewAn2AO1OSkAh7YFU=
240-
github.com/nexus-rpc/sdk-go v0.5.1/go.mod h1:FHdPfVQwRuJFZFTF0Y2GOAxCrbIBNrcPna9slkGKPYk=
239+
github.com/nexus-rpc/sdk-go v0.5.2-0.20260211051645-26b0b4c584e5 h1:Van9KGGs8lcDgxzSNFbDhEMNeJ80TbBxwZ45f9iBk9U=
240+
github.com/nexus-rpc/sdk-go v0.5.2-0.20260211051645-26b0b4c584e5/go.mod h1:FHdPfVQwRuJFZFTF0Y2GOAxCrbIBNrcPna9slkGKPYk=
241241
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
242242
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
243243
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
@@ -310,6 +310,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
310310
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
311311
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
312312
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
313+
github.com/temporalio/api-go v1.62.2-0.20260217225453-e6a9241288b9 h1:nv1DjGfsfM/ITt5ehoHodVzCtTxv+mM+sMqM9Zgx0Tc=
314+
github.com/temporalio/api-go v1.62.2-0.20260217225453-e6a9241288b9/go.mod h1:oewVgOWEx67DlpbXkEJl5PlcpDPXjR8h9+raDfl0fpo=
313315
github.com/temporalio/ringpop-go v0.0.0-20250130211428-b97329e994f7 h1:lEebX/hZss+TSH3EBwhztnBavJVj7pWGJOH8UgKHS0w=
314316
github.com/temporalio/ringpop-go v0.0.0-20250130211428-b97329e994f7/go.mod h1:RE+CHmY+kOZQk47AQaVzwrGmxpflnLgTd6EOK0853j4=
315317
github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb h1:YzHH/U/dN7vMP+glybzcXRTczTrgfdRisNTzAj7La04=
@@ -375,8 +377,6 @@ go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC
375377
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
376378
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
377379
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
378-
go.temporal.io/api v1.62.2-0.20260211212044-12e31472fd35 h1:5Ig1D6s0oQVnj5blVPwoMqG/jvVaHcWWHXO9Y4B9n/M=
379-
go.temporal.io/api v1.62.2-0.20260211212044-12e31472fd35/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
380380
go.temporal.io/sdk v1.38.0 h1:4Bok5LEdED7YKpsSjIa3dDqram5VOq+ydBf4pyx0Wo4=
381381
go.temporal.io/sdk v1.38.0/go.mod h1:a+R2Ej28ObvHoILbHaxMyind7M6D+W0L7edt5UJF4SE=
382382
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

service/matching/forwarder.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ func (fwdr *Forwarder) ForwardPoll(ctx context.Context, pollMetadata *pollMetada
249249
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
250250
DeploymentOptions: pollMetadata.deploymentOptions,
251251
WorkerInstanceKey: pollMetadata.workerInstanceKey,
252+
WorkerControlTaskQueue: pollMetadata.workerControlTaskQueue,
252253
},
253254
ForwardedSource: fwdr.partition.RpcName(),
254255
Conditions: pollMetadata.conditions,
@@ -273,6 +274,7 @@ func (fwdr *Forwarder) ForwardPoll(ctx context.Context, pollMetadata *pollMetada
273274
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
274275
DeploymentOptions: pollMetadata.deploymentOptions,
275276
WorkerInstanceKey: pollMetadata.workerInstanceKey,
277+
WorkerControlTaskQueue: pollMetadata.workerControlTaskQueue,
276278
},
277279
ForwardedSource: fwdr.partition.RpcName(),
278280
Conditions: pollMetadata.conditions,

service/matching/matching_engine.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ type (
9595
forwardedFrom string
9696
localPollStartTime time.Time
9797
workerInstanceKey string
98+
workerControlTaskQueue string
9899
}
99100

100101
userDataUpdate struct {
@@ -679,6 +680,7 @@ pollLoop:
679680
forwardedFrom: req.ForwardedSource,
680681
conditions: req.Conditions,
681682
workerInstanceKey: request.WorkerInstanceKey,
683+
workerControlTaskQueue: request.WorkerControlTaskQueue,
682684
}
683685
task, versionSetUsed, err := e.pollTask(pollerCtx, partition, pollMetadata)
684686
if err != nil {
@@ -984,6 +986,7 @@ pollLoop:
984986
forwardedFrom: req.ForwardedSource,
985987
conditions: req.Conditions,
986988
workerInstanceKey: request.WorkerInstanceKey,
989+
workerControlTaskQueue: request.WorkerControlTaskQueue,
987990
}
988991
task, versionSetUsed, err := e.pollTask(pollerCtx, partition, pollMetadata)
989992
if err != nil {

service/matching/pri_forwarder.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ func ForwardPollWithTarget(
219219
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
220220
DeploymentOptions: pollMetadata.deploymentOptions,
221221
WorkerInstanceKey: pollMetadata.workerInstanceKey,
222+
WorkerControlTaskQueue: pollMetadata.workerControlTaskQueue,
222223
},
223224
ForwardedSource: source.RpcName(),
224225
Conditions: pollMetadata.conditions,
@@ -243,6 +244,7 @@ func ForwardPollWithTarget(
243244
WorkerVersionCapabilities: pollMetadata.workerVersionCapabilities,
244245
DeploymentOptions: pollMetadata.deploymentOptions,
245246
WorkerInstanceKey: pollMetadata.workerInstanceKey,
247+
WorkerControlTaskQueue: pollMetadata.workerControlTaskQueue,
246248
},
247249
ForwardedSource: source.RpcName(),
248250
Conditions: pollMetadata.conditions,

0 commit comments

Comments
 (0)