Skip to content
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

Jump to bottom

Raname WorkflowTaskTimeout to DefaultWorkflowTaskTimeout and CurrentWorkflowTaskTimeout to WorkflowTaskTimeout #556

Merged
merged 4 commits into from
Jul 20, 2020
Merged

Raname WorkflowTaskTimeout to DefaultWorkflowTaskTimeout and CurrentWorkflowTaskTimeout to WorkflowTaskTimeout #556

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
162eff1
Raname WorkflowTaskTimeout to DefaultWorkflowTaskTimeout and CurrentW…
alexshtin Jul 17, 2020
07dd5d6
Merge branch 'master' into feature/rename-current-workflow-task-timeout
alexshtin Jul 18, 2020
fc38892
Fix formating.
alexshtin Jul 20, 2020
818d934
Merge branch 'master' into feature/rename-current-workflow-task-timeout
alexshtin Jul 20, 2020
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
574 changes: 287 additions & 287 deletions api/persistenceblobs/v1/message.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions common/persistence/dataInterfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ type (
WorkflowTypeName string
WorkflowRunTimeout int32
WorkflowExecutionTimeout int32
WorkflowTaskTimeout int32
DefaultWorkflowTaskTimeout int32
State enumsspb.WorkflowExecutionState
Status enumspb.WorkflowExecutionStatus
LastFirstEventID int64
Expand All @@ -229,7 +229,7 @@ type (
WorkflowTaskScheduleID int64
WorkflowTaskStartedID int64
WorkflowTaskRequestID string
CurrentWorkflowTaskTimeout int32
WorkflowTaskTimeout int32
WorkflowTaskAttempt int64
WorkflowTaskStartedTimestamp int64
WorkflowTaskScheduledTimestamp int64
Expand Down
8 changes: 4 additions & 4 deletions common/persistence/executionStore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (m *executionManagerImpl) DeserializeExecutionInfo(
WorkflowTypeName: info.WorkflowTypeName,
WorkflowRunTimeout: info.WorkflowRunTimeout,
WorkflowExecutionTimeout: info.WorkflowExecutionTimeout,
WorkflowTaskTimeout: info.WorkflowTaskTimeout,
DefaultWorkflowTaskTimeout: info.DefaultWorkflowTaskTimeout,
State: info.State,
Status: info.Status,
LastFirstEventID: info.LastFirstEventID,
Expand All @@ -157,7 +157,7 @@ func (m *executionManagerImpl) DeserializeExecutionInfo(
WorkflowTaskScheduleID: info.WorkflowTaskScheduleID,
WorkflowTaskStartedID: info.WorkflowTaskStartedID,
WorkflowTaskRequestID: info.WorkflowTaskRequestID,
CurrentWorkflowTaskTimeout: info.CurrentWorkflowTaskTimeout,
WorkflowTaskTimeout: info.WorkflowTaskTimeout,
WorkflowTaskAttempt: info.WorkflowTaskAttempt,
WorkflowTaskStartedTimestamp: info.WorkflowTaskStartedTimestamp,
WorkflowTaskScheduledTimestamp: info.WorkflowTaskScheduledTimestamp,
Expand Down Expand Up @@ -447,7 +447,7 @@ func (m *executionManagerImpl) SerializeExecutionInfo(
WorkflowTypeName: info.WorkflowTypeName,
WorkflowRunTimeout: info.WorkflowRunTimeout,
WorkflowExecutionTimeout: info.WorkflowExecutionTimeout,
WorkflowTaskTimeout: info.WorkflowTaskTimeout,
DefaultWorkflowTaskTimeout: info.DefaultWorkflowTaskTimeout,
State: info.State,
Status: info.Status,
LastFirstEventID: info.LastFirstEventID,
Expand All @@ -462,7 +462,7 @@ func (m *executionManagerImpl) SerializeExecutionInfo(
WorkflowTaskScheduleID: info.WorkflowTaskScheduleID,
WorkflowTaskStartedID: info.WorkflowTaskStartedID,
WorkflowTaskRequestID: info.WorkflowTaskRequestID,
CurrentWorkflowTaskTimeout: info.CurrentWorkflowTaskTimeout,
WorkflowTaskTimeout: info.WorkflowTaskTimeout,
WorkflowTaskAttempt: info.WorkflowTaskAttempt,
WorkflowTaskStartedTimestamp: info.WorkflowTaskStartedTimestamp,
WorkflowTaskScheduledTimestamp: info.WorkflowTaskScheduledTimestamp,
Expand Down
494 changes: 247 additions & 247 deletions common/persistence/persistence-tests/executionManagerTest.go
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 49 additions & 49 deletions common/persistence/persistence-tests/executionManagerTestForEventsV2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowCreation() {
TaskQueue: "taskQueue",
WorkflowTypeName: "wType",
WorkflowRunTimeout: 20,
WorkflowTaskTimeout: 13,
DefaultWorkflowTaskTimeout: 13,
State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
NextEventID: 3,
LastProcessedEvent: 0,
WorkflowTaskScheduleID: 2,
WorkflowTaskStartedID: common.EmptyEventID,
CurrentWorkflowTaskTimeout: 1,
WorkflowTaskTimeout: 1,
BranchToken: []byte("branchToken1"),
},
ExecutionStats: &p.ExecutionStats{},
Expand Down Expand Up @@ -222,23 +222,23 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowCreationWithVersionHistor
RangeID: s.ShardInfo.GetRangeId(),
NewWorkflowSnapshot: p.WorkflowSnapshot{
ExecutionInfo: &p.WorkflowExecutionInfo{
CreateRequestID: uuid.New(),
NamespaceID: namespaceID,
WorkflowID: workflowExecution.GetWorkflowId(),
RunID: workflowExecution.GetRunId(),
TaskQueue: "taskQueue",
WorkflowTypeName: "wType",
WorkflowRunTimeout: 20,
WorkflowTaskTimeout: 13,

State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
NextEventID: common.EmptyEventID,
LastProcessedEvent: 0,
WorkflowTaskScheduleID: 2,
WorkflowTaskStartedID: common.EmptyEventID,
CurrentWorkflowTaskTimeout: 1,
BranchToken: nil,
CreateRequestID: uuid.New(),
NamespaceID: namespaceID,
WorkflowID: workflowExecution.GetWorkflowId(),
RunID: workflowExecution.GetRunId(),
TaskQueue: "taskQueue",
WorkflowTypeName: "wType",
WorkflowRunTimeout: 20,
DefaultWorkflowTaskTimeout: 13,

State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
NextEventID: common.EmptyEventID,
LastProcessedEvent: 0,
WorkflowTaskScheduleID: 2,
WorkflowTaskStartedID: common.EmptyEventID,
WorkflowTaskTimeout: 1,
BranchToken: nil,
},
ExecutionStats: &p.ExecutionStats{},
VersionHistories: versionHistories,
Expand Down Expand Up @@ -345,23 +345,23 @@ func (s *ExecutionManagerSuiteForEventsV2) TestContinueAsNew() {
},
NewWorkflowSnapshot: &p.WorkflowSnapshot{
ExecutionInfo: &p.WorkflowExecutionInfo{
CreateRequestID: uuid.New(),
NamespaceID: updatedInfo.NamespaceID,
WorkflowID: newWorkflowExecution.GetWorkflowId(),
RunID: newWorkflowExecution.GetRunId(),
TaskQueue: updatedInfo.TaskQueue,
WorkflowTypeName: updatedInfo.WorkflowTypeName,
WorkflowRunTimeout: updatedInfo.WorkflowRunTimeout,
WorkflowTaskTimeout: updatedInfo.WorkflowTaskTimeout,

State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
NextEventID: info0.NextEventID,
LastProcessedEvent: common.EmptyEventID,
WorkflowTaskScheduleID: int64(2),
WorkflowTaskStartedID: common.EmptyEventID,
CurrentWorkflowTaskTimeout: 1,
BranchToken: []byte("branchToken1"),
CreateRequestID: uuid.New(),
NamespaceID: updatedInfo.NamespaceID,
WorkflowID: newWorkflowExecution.GetWorkflowId(),
RunID: newWorkflowExecution.GetRunId(),
TaskQueue: updatedInfo.TaskQueue,
WorkflowTypeName: updatedInfo.WorkflowTypeName,
WorkflowRunTimeout: updatedInfo.WorkflowRunTimeout,
DefaultWorkflowTaskTimeout: updatedInfo.DefaultWorkflowTaskTimeout,

State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
NextEventID: info0.NextEventID,
LastProcessedEvent: common.EmptyEventID,
WorkflowTaskScheduleID: int64(2),
WorkflowTaskStartedID: common.EmptyEventID,
WorkflowTaskTimeout: 1,
BranchToken: []byte("branchToken1"),
},
ExecutionStats: &p.ExecutionStats{},
TransferTasks: nil,
Expand Down Expand Up @@ -488,7 +488,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowWithReplicationState() {
s.Equal("taskQueue", info0.TaskQueue)
s.Equal("wType", info0.WorkflowTypeName)
s.Equal(int32(20), info0.WorkflowRunTimeout)
s.Equal(int32(13), info0.WorkflowTaskTimeout)
s.Equal(int32(13), info0.DefaultWorkflowTaskTimeout)
s.Equal(int64(3), info0.NextEventID)
s.Equal(int64(0), info0.LastProcessedEvent)
s.Equal(int64(2), info0.WorkflowTaskScheduleID)
Expand Down Expand Up @@ -586,7 +586,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowWithReplicationState() {
s.Equal("taskQueue", info1.TaskQueue)
s.Equal("wType", info1.WorkflowTypeName)
s.Equal(int32(20), info1.WorkflowRunTimeout)
s.Equal(int32(13), info1.WorkflowTaskTimeout)
s.Equal(int32(13), info1.DefaultWorkflowTaskTimeout)
s.Equal(int64(5), info1.NextEventID)
s.Equal([]byte("branchToken3"), info1.BranchToken)
s.Equal(int64(2), info1.LastProcessedEvent)
Expand Down Expand Up @@ -647,14 +647,14 @@ func (s *ExecutionManagerSuiteForEventsV2) createWorkflowExecutionWithReplicatio
TaskQueue: taskQueue,
WorkflowTypeName: wType,
WorkflowRunTimeout: wTimeout,
WorkflowTaskTimeout: workflowTaskTimeout,
DefaultWorkflowTaskTimeout: workflowTaskTimeout,
State: enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING,
Status: enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
NextEventID: nextEventID,
LastProcessedEvent: lastProcessedEventID,
WorkflowTaskScheduleID: workflowTaskScheduleID,
WorkflowTaskStartedID: common.EmptyEventID,
CurrentWorkflowTaskTimeout: 1,
WorkflowTaskTimeout: 1,
BranchToken: brToken,
},
ExecutionStats: &p.ExecutionStats{},
Expand Down Expand Up @@ -782,7 +782,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetWithCurrWithReplicat
s.Equal("taskQueue", info0.TaskQueue)
s.Equal("wType", info0.WorkflowTypeName)
s.Equal(int32(20), info0.WorkflowRunTimeout)
s.Equal(int32(13), info0.WorkflowTaskTimeout)
s.Equal(int32(13), info0.DefaultWorkflowTaskTimeout)
s.Equal(int64(3), info0.NextEventID)
s.Equal(int64(0), info0.LastProcessedEvent)
s.Equal(int64(2), info0.WorkflowTaskScheduleID)
Expand Down Expand Up @@ -1021,7 +1021,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetWithCurrWithReplicat
s.Equal("taskQueue", info1.TaskQueue)
s.Equal("wType", info1.WorkflowTypeName)
s.Equal(int32(20), info1.WorkflowRunTimeout)
s.Equal(int32(13), info1.WorkflowTaskTimeout)
s.Equal(int32(13), info1.DefaultWorkflowTaskTimeout)
s.Equal(int64(2), info1.WorkflowTaskScheduleID)

s.NotNil(replicationState1, "Valid replication state expected.")
Expand Down Expand Up @@ -1058,7 +1058,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetWithCurrWithReplicat
s.Equal("taskQueue", info2.TaskQueue)
s.Equal("wType", info2.WorkflowTypeName)
s.Equal(int32(20), info2.WorkflowRunTimeout)
s.Equal(int32(13), info2.WorkflowTaskTimeout)
s.Equal(int32(13), info2.DefaultWorkflowTaskTimeout)
s.Equal(int64(2), info2.WorkflowTaskScheduleID)

s.NotNil(replicationState2, "Valid replication state expected.")
Expand Down Expand Up @@ -1215,7 +1215,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrWithReplicate(
s.Equal("taskQueue", info0.TaskQueue)
s.Equal("wType", info0.WorkflowTypeName)
s.Equal(int32(20), info0.WorkflowRunTimeout)
s.Equal(int32(13), info0.WorkflowTaskTimeout)
s.Equal(int32(13), info0.DefaultWorkflowTaskTimeout)
s.Equal(int64(3), info0.NextEventID)
s.Equal(int64(0), info0.LastProcessedEvent)
s.Equal(int64(2), info0.WorkflowTaskScheduleID)
Expand Down Expand Up @@ -1428,7 +1428,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrWithReplicate(
s.Equal("taskQueue", info1.TaskQueue)
s.Equal("wType", info1.WorkflowTypeName)
s.Equal(int32(20), info1.WorkflowRunTimeout)
s.Equal(int32(13), info1.WorkflowTaskTimeout)
s.Equal(int32(13), info1.DefaultWorkflowTaskTimeout)
s.Equal(int64(2), info1.WorkflowTaskScheduleID)

s.NotNil(replicationState1, "Valid replication state expected.")
Expand Down Expand Up @@ -1465,7 +1465,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrWithReplicate(
s.Equal("taskQueue", info2.TaskQueue)
s.Equal("wType", info2.WorkflowTypeName)
s.Equal(int32(20), info2.WorkflowRunTimeout)
s.Equal(int32(13), info2.WorkflowTaskTimeout)
s.Equal(int32(13), info2.DefaultWorkflowTaskTimeout)
s.Equal(int64(2), info2.WorkflowTaskScheduleID)

s.NotNil(replicationState2, "Valid replication state expected.")
Expand Down Expand Up @@ -1553,7 +1553,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrNoReplicate()
s.Equal("taskQueue", info0.TaskQueue)
s.Equal("wType", info0.WorkflowTypeName)
s.Equal(int32(20), info0.WorkflowRunTimeout)
s.Equal(int32(13), info0.WorkflowTaskTimeout)
s.Equal(int32(13), info0.DefaultWorkflowTaskTimeout)
s.Equal(int64(3), info0.NextEventID)
s.Equal(int64(0), info0.LastProcessedEvent)
s.Equal(int64(2), info0.WorkflowTaskScheduleID)
Expand Down Expand Up @@ -1659,7 +1659,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrNoReplicate()
s.Equal("taskQueue", info1.TaskQueue)
s.Equal("wType", info1.WorkflowTypeName)
s.Equal(int32(20), info1.WorkflowRunTimeout)
s.Equal(int32(13), info1.WorkflowTaskTimeout)
s.Equal(int32(13), info1.DefaultWorkflowTaskTimeout)
s.Equal(int64(2), info1.WorkflowTaskScheduleID)

// the current execution
Expand All @@ -1675,7 +1675,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrNoReplicate()
s.Equal("taskQueue", info2.TaskQueue)
s.Equal("wType", info2.WorkflowTypeName)
s.Equal(int32(20), info2.WorkflowRunTimeout)
s.Equal(int32(13), info2.WorkflowTaskTimeout)
s.Equal(int32(13), info2.DefaultWorkflowTaskTimeout)
s.Equal(int64(2), info2.WorkflowTaskScheduleID)

timerInfos2 := state2.TimerInfos
Expand Down
Loading