Skip to content

Commit d066a7d

Browse files
alexshtinalexshtin
authored
Raname WorkflowTaskTimeout to DefaultWorkflowTaskTimeout and CurrentWorkflowTaskTimeout to WorkflowTaskTimeout (#556)
1 parent 2411b19 commit d066a7d

File tree

16 files changed

+704
-704
lines changed

16 files changed

+704
-704
lines changed

‎api/persistenceblobs/v1/message.pb.go‎

Lines changed: 287 additions & 287 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/persistence/dataInterfaces.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ type (
214214
WorkflowTypeName string
215215
WorkflowRunTimeout int32
216216
WorkflowExecutionTimeout int32
217-
WorkflowTaskTimeout int32
217+
DefaultWorkflowTaskTimeout int32
218218
State enumsspb.WorkflowExecutionState
219219
Status enumspb.WorkflowExecutionStatus
220220
LastFirstEventID int64
@@ -229,7 +229,7 @@ type (
229229
WorkflowTaskScheduleID int64
230230
WorkflowTaskStartedID int64
231231
WorkflowTaskRequestID string
232-
CurrentWorkflowTaskTimeout int32
232+
WorkflowTaskTimeout int32
233233
WorkflowTaskAttempt int64
234234
WorkflowTaskStartedTimestamp int64
235235
WorkflowTaskScheduledTimestamp int64

‎common/persistence/executionStore.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func (m *executionManagerImpl) DeserializeExecutionInfo(
142142
WorkflowTypeName: info.WorkflowTypeName,
143143
WorkflowRunTimeout: info.WorkflowRunTimeout,
144144
WorkflowExecutionTimeout: info.WorkflowExecutionTimeout,
145-
WorkflowTaskTimeout: info.WorkflowTaskTimeout,
145+
DefaultWorkflowTaskTimeout: info.DefaultWorkflowTaskTimeout,
146146
State: info.State,
147147
Status: info.Status,
148148
LastFirstEventID: info.LastFirstEventID,
@@ -157,7 +157,7 @@ func (m *executionManagerImpl) DeserializeExecutionInfo(
157157
WorkflowTaskScheduleID: info.WorkflowTaskScheduleID,
158158
WorkflowTaskStartedID: info.WorkflowTaskStartedID,
159159
WorkflowTaskRequestID: info.WorkflowTaskRequestID,
160-
CurrentWorkflowTaskTimeout: info.CurrentWorkflowTaskTimeout,
160+
WorkflowTaskTimeout: info.WorkflowTaskTimeout,
161161
WorkflowTaskAttempt: info.WorkflowTaskAttempt,
162162
WorkflowTaskStartedTimestamp: info.WorkflowTaskStartedTimestamp,
163163
WorkflowTaskScheduledTimestamp: info.WorkflowTaskScheduledTimestamp,
@@ -447,7 +447,7 @@ func (m *executionManagerImpl) SerializeExecutionInfo(
447447
WorkflowTypeName: info.WorkflowTypeName,
448448
WorkflowRunTimeout: info.WorkflowRunTimeout,
449449
WorkflowExecutionTimeout: info.WorkflowExecutionTimeout,
450-
WorkflowTaskTimeout: info.WorkflowTaskTimeout,
450+
DefaultWorkflowTaskTimeout: info.DefaultWorkflowTaskTimeout,
451451
State: info.State,
452452
Status: info.Status,
453453
LastFirstEventID: info.LastFirstEventID,
@@ -462,7 +462,7 @@ func (m *executionManagerImpl) SerializeExecutionInfo(
462462
WorkflowTaskScheduleID: info.WorkflowTaskScheduleID,
463463
WorkflowTaskStartedID: info.WorkflowTaskStartedID,
464464
WorkflowTaskRequestID: info.WorkflowTaskRequestID,
465-
CurrentWorkflowTaskTimeout: info.CurrentWorkflowTaskTimeout,
465+
WorkflowTaskTimeout: info.WorkflowTaskTimeout,
466466
WorkflowTaskAttempt: info.WorkflowTaskAttempt,
467467
WorkflowTaskStartedTimestamp: info.WorkflowTaskStartedTimestamp,
468468
WorkflowTaskScheduledTimestamp: info.WorkflowTaskScheduledTimestamp,

‎common/persistence/persistence-tests/executionManagerTest.go‎

Lines changed: 247 additions & 247 deletions
Large diffs are not rendered by default.

‎common/persistence/persistence-tests/executionManagerTestForEventsV2.go‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowCreation() {
126126
TaskQueue: "taskQueue",
127127
WorkflowTypeName: "wType",
128128
WorkflowRunTimeout: 20,
129-
WorkflowTaskTimeout: 13,
129+
DefaultWorkflowTaskTimeout: 13,
130130
State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
131131
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
132132
NextEventID: 3,
133133
LastProcessedEvent: 0,
134134
WorkflowTaskScheduleID: 2,
135135
WorkflowTaskStartedID: common.EmptyEventID,
136-
CurrentWorkflowTaskTimeout: 1,
136+
WorkflowTaskTimeout: 1,
137137
BranchToken: []byte("branchToken1"),
138138
},
139139
ExecutionStats: &p.ExecutionStats{},
@@ -222,23 +222,23 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowCreationWithVersionHistor
222222
RangeID: s.ShardInfo.GetRangeId(),
223223
NewWorkflowSnapshot: p.WorkflowSnapshot{
224224
ExecutionInfo: &p.WorkflowExecutionInfo{
225-
CreateRequestID: uuid.New(),
226-
NamespaceID: namespaceID,
227-
WorkflowID: workflowExecution.GetWorkflowId(),
228-
RunID: workflowExecution.GetRunId(),
229-
TaskQueue: "taskQueue",
230-
WorkflowTypeName: "wType",
231-
WorkflowRunTimeout: 20,
232-
WorkflowTaskTimeout: 13,
233-
234-
State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
235-
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
236-
NextEventID: common.EmptyEventID,
237-
LastProcessedEvent: 0,
238-
WorkflowTaskScheduleID: 2,
239-
WorkflowTaskStartedID: common.EmptyEventID,
240-
CurrentWorkflowTaskTimeout: 1,
241-
BranchToken: nil,
225+
CreateRequestID: uuid.New(),
226+
NamespaceID: namespaceID,
227+
WorkflowID: workflowExecution.GetWorkflowId(),
228+
RunID: workflowExecution.GetRunId(),
229+
TaskQueue: "taskQueue",
230+
WorkflowTypeName: "wType",
231+
WorkflowRunTimeout: 20,
232+
DefaultWorkflowTaskTimeout: 13,
233+
234+
State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
235+
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
236+
NextEventID: common.EmptyEventID,
237+
LastProcessedEvent: 0,
238+
WorkflowTaskScheduleID: 2,
239+
WorkflowTaskStartedID: common.EmptyEventID,
240+
WorkflowTaskTimeout: 1,
241+
BranchToken: nil,
242242
},
243243
ExecutionStats: &p.ExecutionStats{},
244244
VersionHistories: versionHistories,
@@ -345,23 +345,23 @@ func (s *ExecutionManagerSuiteForEventsV2) TestContinueAsNew() {
345345
},
346346
NewWorkflowSnapshot: &p.WorkflowSnapshot{
347347
ExecutionInfo: &p.WorkflowExecutionInfo{
348-
CreateRequestID: uuid.New(),
349-
NamespaceID: updatedInfo.NamespaceID,
350-
WorkflowID: newWorkflowExecution.GetWorkflowId(),
351-
RunID: newWorkflowExecution.GetRunId(),
352-
TaskQueue: updatedInfo.TaskQueue,
353-
WorkflowTypeName: updatedInfo.WorkflowTypeName,
354-
WorkflowRunTimeout: updatedInfo.WorkflowRunTimeout,
355-
WorkflowTaskTimeout: updatedInfo.WorkflowTaskTimeout,
356-
357-
State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
358-
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
359-
NextEventID: info0.NextEventID,
360-
LastProcessedEvent: common.EmptyEventID,
361-
WorkflowTaskScheduleID: int64(2),
362-
WorkflowTaskStartedID: common.EmptyEventID,
363-
CurrentWorkflowTaskTimeout: 1,
364-
BranchToken: []byte("branchToken1"),
348+
CreateRequestID: uuid.New(),
349+
NamespaceID: updatedInfo.NamespaceID,
350+
WorkflowID: newWorkflowExecution.GetWorkflowId(),
351+
RunID: newWorkflowExecution.GetRunId(),
352+
TaskQueue: updatedInfo.TaskQueue,
353+
WorkflowTypeName: updatedInfo.WorkflowTypeName,
354+
WorkflowRunTimeout: updatedInfo.WorkflowRunTimeout,
355+
DefaultWorkflowTaskTimeout: updatedInfo.DefaultWorkflowTaskTimeout,
356+
357+
State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
358+
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
359+
NextEventID: info0.NextEventID,
360+
LastProcessedEvent: common.EmptyEventID,
361+
WorkflowTaskScheduleID: int64(2),
362+
WorkflowTaskStartedID: common.EmptyEventID,
363+
WorkflowTaskTimeout: 1,
364+
BranchToken: []byte("branchToken1"),
365365
},
366366
ExecutionStats: &p.ExecutionStats{},
367367
TransferTasks: nil,
@@ -488,7 +488,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowWithReplicationState() {
488488
s.Equal("taskQueue", info0.TaskQueue)
489489
s.Equal("wType", info0.WorkflowTypeName)
490490
s.Equal(int32(20), info0.WorkflowRunTimeout)
491-
s.Equal(int32(13), info0.WorkflowTaskTimeout)
491+
s.Equal(int32(13), info0.DefaultWorkflowTaskTimeout)
492492
s.Equal(int64(3), info0.NextEventID)
493493
s.Equal(int64(0), info0.LastProcessedEvent)
494494
s.Equal(int64(2), info0.WorkflowTaskScheduleID)
@@ -586,7 +586,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowWithReplicationState() {
586586
s.Equal("taskQueue", info1.TaskQueue)
587587
s.Equal("wType", info1.WorkflowTypeName)
588588
s.Equal(int32(20), info1.WorkflowRunTimeout)
589-
s.Equal(int32(13), info1.WorkflowTaskTimeout)
589+
s.Equal(int32(13), info1.DefaultWorkflowTaskTimeout)
590590
s.Equal(int64(5), info1.NextEventID)
591591
s.Equal([]byte("branchToken3"), info1.BranchToken)
592592
s.Equal(int64(2), info1.LastProcessedEvent)
@@ -647,14 +647,14 @@ func (s *ExecutionManagerSuiteForEventsV2) createWorkflowExecutionWithReplicatio
647647
TaskQueue: taskQueue,
648648
WorkflowTypeName: wType,
649649
WorkflowRunTimeout: wTimeout,
650-
WorkflowTaskTimeout: workflowTaskTimeout,
650+
DefaultWorkflowTaskTimeout: workflowTaskTimeout,
651651
State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
652652
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
653653
NextEventID: nextEventID,
654654
LastProcessedEvent: lastProcessedEventID,
655655
WorkflowTaskScheduleID: workflowTaskScheduleID,
656656
WorkflowTaskStartedID: common.EmptyEventID,
657-
CurrentWorkflowTaskTimeout: 1,
657+
WorkflowTaskTimeout: 1,
658658
BranchToken: brToken,
659659
},
660660
ExecutionStats: &p.ExecutionStats{},
@@ -782,7 +782,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetWithCurrWithReplicat
782782
s.Equal("taskQueue", info0.TaskQueue)
783783
s.Equal("wType", info0.WorkflowTypeName)
784784
s.Equal(int32(20), info0.WorkflowRunTimeout)
785-
s.Equal(int32(13), info0.WorkflowTaskTimeout)
785+
s.Equal(int32(13), info0.DefaultWorkflowTaskTimeout)
786786
s.Equal(int64(3), info0.NextEventID)
787787
s.Equal(int64(0), info0.LastProcessedEvent)
788788
s.Equal(int64(2), info0.WorkflowTaskScheduleID)
@@ -1021,7 +1021,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetWithCurrWithReplicat
10211021
s.Equal("taskQueue", info1.TaskQueue)
10221022
s.Equal("wType", info1.WorkflowTypeName)
10231023
s.Equal(int32(20), info1.WorkflowRunTimeout)
1024-
s.Equal(int32(13), info1.WorkflowTaskTimeout)
1024+
s.Equal(int32(13), info1.DefaultWorkflowTaskTimeout)
10251025
s.Equal(int64(2), info1.WorkflowTaskScheduleID)
10261026

10271027
s.NotNil(replicationState1, "Valid replication state expected.")
@@ -1058,7 +1058,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetWithCurrWithReplicat
10581058
s.Equal("taskQueue", info2.TaskQueue)
10591059
s.Equal("wType", info2.WorkflowTypeName)
10601060
s.Equal(int32(20), info2.WorkflowRunTimeout)
1061-
s.Equal(int32(13), info2.WorkflowTaskTimeout)
1061+
s.Equal(int32(13), info2.DefaultWorkflowTaskTimeout)
10621062
s.Equal(int64(2), info2.WorkflowTaskScheduleID)
10631063

10641064
s.NotNil(replicationState2, "Valid replication state expected.")
@@ -1215,7 +1215,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrWithReplicate(
12151215
s.Equal("taskQueue", info0.TaskQueue)
12161216
s.Equal("wType", info0.WorkflowTypeName)
12171217
s.Equal(int32(20), info0.WorkflowRunTimeout)
1218-
s.Equal(int32(13), info0.WorkflowTaskTimeout)
1218+
s.Equal(int32(13), info0.DefaultWorkflowTaskTimeout)
12191219
s.Equal(int64(3), info0.NextEventID)
12201220
s.Equal(int64(0), info0.LastProcessedEvent)
12211221
s.Equal(int64(2), info0.WorkflowTaskScheduleID)
@@ -1428,7 +1428,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrWithReplicate(
14281428
s.Equal("taskQueue", info1.TaskQueue)
14291429
s.Equal("wType", info1.WorkflowTypeName)
14301430
s.Equal(int32(20), info1.WorkflowRunTimeout)
1431-
s.Equal(int32(13), info1.WorkflowTaskTimeout)
1431+
s.Equal(int32(13), info1.DefaultWorkflowTaskTimeout)
14321432
s.Equal(int64(2), info1.WorkflowTaskScheduleID)
14331433

14341434
s.NotNil(replicationState1, "Valid replication state expected.")
@@ -1465,7 +1465,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrWithReplicate(
14651465
s.Equal("taskQueue", info2.TaskQueue)
14661466
s.Equal("wType", info2.WorkflowTypeName)
14671467
s.Equal(int32(20), info2.WorkflowRunTimeout)
1468-
s.Equal(int32(13), info2.WorkflowTaskTimeout)
1468+
s.Equal(int32(13), info2.DefaultWorkflowTaskTimeout)
14691469
s.Equal(int64(2), info2.WorkflowTaskScheduleID)
14701470

14711471
s.NotNil(replicationState2, "Valid replication state expected.")
@@ -1553,7 +1553,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrNoReplicate()
15531553
s.Equal("taskQueue", info0.TaskQueue)
15541554
s.Equal("wType", info0.WorkflowTypeName)
15551555
s.Equal(int32(20), info0.WorkflowRunTimeout)
1556-
s.Equal(int32(13), info0.WorkflowTaskTimeout)
1556+
s.Equal(int32(13), info0.DefaultWorkflowTaskTimeout)
15571557
s.Equal(int64(3), info0.NextEventID)
15581558
s.Equal(int64(0), info0.LastProcessedEvent)
15591559
s.Equal(int64(2), info0.WorkflowTaskScheduleID)
@@ -1659,7 +1659,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrNoReplicate()
16591659
s.Equal("taskQueue", info1.TaskQueue)
16601660
s.Equal("wType", info1.WorkflowTypeName)
16611661
s.Equal(int32(20), info1.WorkflowRunTimeout)
1662-
s.Equal(int32(13), info1.WorkflowTaskTimeout)
1662+
s.Equal(int32(13), info1.DefaultWorkflowTaskTimeout)
16631663
s.Equal(int64(2), info1.WorkflowTaskScheduleID)
16641664

16651665
// the current execution
@@ -1675,7 +1675,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrNoReplicate()
16751675
s.Equal("taskQueue", info2.TaskQueue)
16761676
s.Equal("wType", info2.WorkflowTypeName)
16771677
s.Equal(int32(20), info2.WorkflowRunTimeout)
1678-
s.Equal(int32(13), info2.WorkflowTaskTimeout)
1678+
s.Equal(int32(13), info2.DefaultWorkflowTaskTimeout)
16791679
s.Equal(int64(2), info2.WorkflowTaskScheduleID)
16801680

16811681
timerInfos2 := state2.TimerInfos

0 commit comments

Comments
 (0)