Skip to content

Commit f2bac82

Browse files
Fix workflow replay to ignore -fm suffix (#1014)
When existing workflow is being replayed with old activity names it can result in non-deterministic error if activity was scheduled with older cadence client version. Ignore the suffix the same way, as the rest part of name is ignored by extracting only the `lastPartOfName`
1 parent 07fb281 commit f2bac82

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

internal/internal_task_handlers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,6 +1227,7 @@ matchLoop:
12271227
}
12281228

12291229
func lastPartOfName(name string) string {
1230+
name = strings.TrimSuffix(name, "-fm")
12301231
lastDotIdx := strings.LastIndex(name, ".")
12311232
if lastDotIdx < 0 || lastDotIdx == len(name)-1 {
12321233
return name

internal/internal_worker_test.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,32 @@ func (s *internalWorkerTestSuite) TestReplayWorkflowHistory() {
260260
require.NoError(s.T(), err)
261261
}
262262

263+
func (s *internalWorkerTestSuite) TestReplayWorkflowHistory_Incomplete() {
264+
taskList := "taskList1"
265+
testEvents := []*shared.HistoryEvent{
266+
createTestEventWorkflowExecutionStarted(1, &shared.WorkflowExecutionStartedEventAttributes{
267+
WorkflowType: &shared.WorkflowType{Name: common.StringPtr("go.uber.org/cadence/internal.testReplayWorkflow")},
268+
TaskList: &shared.TaskList{Name: common.StringPtr(taskList)},
269+
Input: testEncodeFunctionArgs(getDefaultDataConverter()),
270+
}),
271+
createTestEventDecisionTaskScheduled(2, &shared.DecisionTaskScheduledEventAttributes{}),
272+
createTestEventDecisionTaskStarted(3),
273+
createTestEventDecisionTaskCompleted(4, &shared.DecisionTaskCompletedEventAttributes{}),
274+
createTestEventActivityTaskScheduled(5, &shared.ActivityTaskScheduledEventAttributes{
275+
ActivityId: common.StringPtr("0"),
276+
ActivityType: &shared.ActivityType{Name: common.StringPtr("testActivity-fm")},
277+
TaskList: &shared.TaskList{Name: &taskList},
278+
}),
279+
}
280+
281+
history := &shared.History{Events: testEvents}
282+
logger := getLogger()
283+
replayer := NewWorkflowReplayer()
284+
replayer.RegisterWorkflow(testReplayWorkflow)
285+
err := replayer.ReplayWorkflowHistory(logger, history)
286+
require.NoError(s.T(), err)
287+
}
288+
263289
func (s *internalWorkerTestSuite) TestReplayWorkflowHistory_LocalActivity() {
264290
taskList := "taskList1"
265291
testEvents := []*shared.HistoryEvent{

0 commit comments

Comments
 (0)