Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Unify complete history tasks methods #6763

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
merged 1 commit into from
Mar 29, 2025
Merged

Unify complete history tasks methods #6763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions 1 common/log/tag/values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ var (
StoreOperationGetTimerIndexTasks = storeOperation("get-timer-index-tasks")
StoreOperationCompleteTimerTask = storeOperation("complete-timer-task")
StoreOperationGetHistoryTasks = storeOperation("get-history-tasks")
StoreOperationCompleteHistoryTask = storeOperation("complete-history-task")
StoreOperationRangeCompleteHistoryTask = storeOperation("range-complete-history-task")

StoreOperationCreateTasks = storeOperation("create-tasks")
Expand Down
3 changes: 3 additions & 0 deletions 3 common/metrics/defs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ const (
PersistenceCompleteTimerTaskScope
// PersistenceGetHistoryTasksScope tracks GetHistoryTasks calls made by service to persistence layer
PersistenceGetHistoryTasksScope
// PersistenceCompleteHistoryTaskScope tracks CompleteHistoryTask calls made by service to persistence layer
PersistenceCompleteHistoryTaskScope
// PersistenceRangeCompleteHistoryTaskScope tracks RangeCompleteHistoryTask calls made by service to persistence layer
PersistenceRangeCompleteHistoryTaskScope
// PersistenceCreateTasksScope tracks CreateTask calls made by service to persistence layer
Expand Down Expand Up @@ -1441,6 +1443,7 @@ var ScopeDefs = map[ServiceIdx]map[int]scopeDefinition{
PersistenceGetTimerIndexTasksScope: {operation: "GetTimerIndexTasks"},
PersistenceCompleteTimerTaskScope: {operation: "CompleteTimerTask"},
PersistenceGetHistoryTasksScope: {operation: "GetHistoryTasks"},
PersistenceCompleteHistoryTaskScope: {operation: "CompleteHistoryTask"},
PersistenceRangeCompleteHistoryTaskScope: {operation: "RangeCompleteHistoryTask"},
PersistenceCreateTasksScope: {operation: "CreateTask"},
PersistenceGetTasksScope: {operation: "GetTasks"},
Expand Down
34 changes: 3 additions & 31 deletions 34 common/mocks/ExecutionManager.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions 15 common/persistence/data_manager_interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,13 @@ type (
NextPageToken []byte
}

// CompleteHistoryTaskRequest is used to complete a history task
CompleteHistoryTaskRequest struct {
TaskCategory HistoryTaskCategory
TaskKey HistoryTaskKey
}

// RangeCompleteHistoryTaskRequest is used to complete a range of history tasks
RangeCompleteHistoryTaskRequest struct {
TaskCategory HistoryTaskCategory
InclusiveMinTaskKey HistoryTaskKey
Expand Down Expand Up @@ -1576,22 +1583,16 @@ type (
GetCurrentExecution(ctx context.Context, request *GetCurrentExecutionRequest) (*GetCurrentExecutionResponse, error)
IsWorkflowExecutionExists(ctx context.Context, request *IsWorkflowExecutionExistsRequest) (*IsWorkflowExecutionExistsResponse, error)

// Transfer task related methods
CompleteTransferTask(ctx context.Context, request *CompleteTransferTaskRequest) error

// Replication task related methods
CompleteReplicationTask(ctx context.Context, request *CompleteReplicationTaskRequest) error
PutReplicationTaskToDLQ(ctx context.Context, request *PutReplicationTaskToDLQRequest) error
GetReplicationTasksFromDLQ(ctx context.Context, request *GetReplicationTasksFromDLQRequest) (*GetHistoryTasksResponse, error)
GetReplicationDLQSize(ctx context.Context, request *GetReplicationDLQSizeRequest) (*GetReplicationDLQSizeResponse, error)
DeleteReplicationTaskFromDLQ(ctx context.Context, request *DeleteReplicationTaskFromDLQRequest) error
RangeDeleteReplicationTaskFromDLQ(ctx context.Context, request *RangeDeleteReplicationTaskFromDLQRequest) (*RangeDeleteReplicationTaskFromDLQResponse, error)
CreateFailoverMarkerTasks(ctx context.Context, request *CreateFailoverMarkersRequest) error

// Timer related methods.
CompleteTimerTask(ctx context.Context, request *CompleteTimerTaskRequest) error

GetHistoryTasks(ctx context.Context, request *GetHistoryTasksRequest) (*GetHistoryTasksResponse, error)
CompleteHistoryTask(ctx context.Context, request *CompleteHistoryTaskRequest) error
RangeCompleteHistoryTask(ctx context.Context, request *RangeCompleteHistoryTaskRequest) (*RangeCompleteHistoryTaskResponse, error)

// Scan operations
Expand Down
40 changes: 6 additions & 34 deletions 40 common/persistence/data_manager_interfaces_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions 8 common/persistence/data_store_interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,23 +110,17 @@ type (
GetCurrentExecution(ctx context.Context, request *GetCurrentExecutionRequest) (*GetCurrentExecutionResponse, error)
IsWorkflowExecutionExists(ctx context.Context, request *IsWorkflowExecutionExistsRequest) (*IsWorkflowExecutionExistsResponse, error)

// Transfer task related methods
CompleteTransferTask(ctx context.Context, request *CompleteTransferTaskRequest) error

// Replication task related methods
CompleteReplicationTask(ctx context.Context, request *CompleteReplicationTaskRequest) error
PutReplicationTaskToDLQ(ctx context.Context, request *InternalPutReplicationTaskToDLQRequest) error
GetReplicationTasksFromDLQ(ctx context.Context, request *GetReplicationTasksFromDLQRequest) (*GetHistoryTasksResponse, error)
GetReplicationDLQSize(ctx context.Context, request *GetReplicationDLQSizeRequest) (*GetReplicationDLQSizeResponse, error)
DeleteReplicationTaskFromDLQ(ctx context.Context, request *DeleteReplicationTaskFromDLQRequest) error
RangeDeleteReplicationTaskFromDLQ(ctx context.Context, request *RangeDeleteReplicationTaskFromDLQRequest) (*RangeDeleteReplicationTaskFromDLQResponse, error)
CreateFailoverMarkerTasks(ctx context.Context, request *CreateFailoverMarkersRequest) error

// Timer related methods.
CompleteTimerTask(ctx context.Context, request *CompleteTimerTaskRequest) error

// History task related methods
GetHistoryTasks(ctx context.Context, request *GetHistoryTasksRequest) (*GetHistoryTasksResponse, error)
CompleteHistoryTask(ctx context.Context, request *CompleteHistoryTaskRequest) error
RangeCompleteHistoryTask(ctx context.Context, request *RangeCompleteHistoryTaskRequest) (*RangeCompleteHistoryTaskResponse, error)

// Scan related methods
Expand Down
40 changes: 6 additions & 34 deletions 40 common/persistence/data_store_interfaces_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 7 additions & 21 deletions 28 common/persistence/execution_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,20 +848,6 @@ func (m *executionManagerImpl) ListConcreteExecutions(
return newResponse, nil
}

func (m *executionManagerImpl) CompleteTransferTask(
ctx context.Context,
request *CompleteTransferTaskRequest,
) error {
return m.persistence.CompleteTransferTask(ctx, request)
}

func (m *executionManagerImpl) CompleteReplicationTask(
ctx context.Context,
request *CompleteReplicationTaskRequest,
) error {
return m.persistence.CompleteReplicationTask(ctx, request)
}

func (m *executionManagerImpl) PutReplicationTaskToDLQ(
ctx context.Context,
request *PutReplicationTaskToDLQRequest,
Expand Down Expand Up @@ -909,13 +895,6 @@ func (m *executionManagerImpl) CreateFailoverMarkerTasks(
return m.persistence.CreateFailoverMarkerTasks(ctx, request)
}

func (m *executionManagerImpl) CompleteTimerTask(
ctx context.Context,
request *CompleteTimerTaskRequest,
) error {
return m.persistence.CompleteTimerTask(ctx, request)
}

func (m *executionManagerImpl) Close() {
m.persistence.Close()
}
Expand Down Expand Up @@ -979,6 +958,13 @@ func (m *executionManagerImpl) GetHistoryTasks(
return m.persistence.GetHistoryTasks(ctx, request)
}

func (m *executionManagerImpl) CompleteHistoryTask(
ctx context.Context,
request *CompleteHistoryTaskRequest,
) error {
return m.persistence.CompleteHistoryTask(ctx, request)
}

func (m *executionManagerImpl) RangeCompleteHistoryTask(
ctx context.Context,
request *RangeCompleteHistoryTaskRequest,
Expand Down
18 changes: 0 additions & 18 deletions 18 common/persistence/execution_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ func TestExecutionManager_ProxyStoreMethods(t *testing.T) {
mockedStore.EXPECT().Close().Return().Times(1)
},
},
{
method: "CompleteTransferTask",
prepareMocks: func(mockedStore *MockExecutionStore) {
mockedStore.EXPECT().CompleteTransferTask(gomock.Any(), gomock.Any()).Return(nil)
},
},
{
method: "GetHistoryTasks",
prepareMocks: func(mockedStore *MockExecutionStore) {
Expand All @@ -109,18 +103,6 @@ func TestExecutionManager_ProxyStoreMethods(t *testing.T) {
mockedStore.EXPECT().RangeDeleteReplicationTaskFromDLQ(gomock.Any(), gomock.Any()).Return(nil, nil)
},
},
{
method: "CompleteTimerTask",
prepareMocks: func(mockedStore *MockExecutionStore) {
mockedStore.EXPECT().CompleteTimerTask(gomock.Any(), gomock.Any()).Return(nil)
},
},
{
method: "CompleteReplicationTask",
prepareMocks: func(mockedStore *MockExecutionStore) {
mockedStore.EXPECT().CompleteReplicationTask(gomock.Any(), gomock.Any()).Return(nil)
},
},
{
method: "DeleteWorkflowExecution",
prepareMocks: func(mockedStore *MockExecutionStore) {
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.