Skip to content

Commit

Permalink
Don't change task generator constructor
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelSnowden committed Feb 1, 2023
1 parent c257d84 commit 58fb5a2
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 6 deletions.
4 changes: 4 additions & 0 deletions common/archiver/archivalMetadata.go
Expand Up @@ -234,3 +234,7 @@ func getNamespaceArchivalState(str string) (enumspb.ArchivalState, error) {
}
return enumspb.ARCHIVAL_STATE_DISABLED, fmt.Errorf("invalid archival state of %v for namespace, valid states are: {\"\", \"disabled\", \"enabled\"}", str)
}

func NewDisabledArchivalMetadata() ArchivalMetadata {
return &archivalMetadata{historyConfig: NewDisabledArchvialConfig(), visibilityConfig: NewDisabledArchvialConfig()}
}
2 changes: 1 addition & 1 deletion service/history/archival_queue_task_executor.go
Expand Up @@ -246,7 +246,7 @@ func (e *archivalQueueTaskExecutor) addDeletionTask(
e.shardContext.GetNamespaceRegistry(),
mutableState,
e.shardContext.GetConfig(),
e.shardContext.GetArchivalMetadata(),
workflow.WithArchivalMetadata(e.shardContext.GetArchivalMetadata()),
)
err = taskGenerator.GenerateDeleteHistoryEventTask(*closeTime, true)
if err != nil {
Expand Down
20 changes: 17 additions & 3 deletions service/history/workflow/task_generator.go
Expand Up @@ -117,17 +117,31 @@ const defaultWorkflowRetention = 1 * 24 * time.Hour

var _ TaskGenerator = (*TaskGeneratorImpl)(nil)

type TaskGeneratorOption func(*TaskGeneratorImpl)

func NewTaskGenerator(
namespaceRegistry namespace.Registry,
mutableState MutableState,
config *configs.Config,
archivalMetadata archiver.ArchivalMetadata,
opts ...TaskGeneratorOption,
) *TaskGeneratorImpl {
return &TaskGeneratorImpl{
r := &TaskGeneratorImpl{
namespaceRegistry: namespaceRegistry,
mutableState: mutableState,
config: config,
archivalMetadata: archivalMetadata,
archivalMetadata: archiver.NewDisabledArchivalMetadata(),
}
for _, opt := range opts {
opt(r)
}
return r
}

// WithArchivalMetadata is used to set the archival metadata for the task generator to determine whether to generate
// archival tasks. The default value is disabled archival metadata.
func WithArchivalMetadata(metadata archiver.ArchivalMetadata) TaskGeneratorOption {
return func(r *TaskGeneratorImpl) {
r.archivalMetadata = metadata
}
}

Expand Down
2 changes: 1 addition & 1 deletion service/history/workflow/task_generator_provider.go
Expand Up @@ -56,6 +56,6 @@ func (p *taskGeneratorProviderImpl) NewTaskGenerator(
shard.GetNamespaceRegistry(),
mutableState,
shard.GetConfig(),
shard.GetArchivalMetadata(),
WithArchivalMetadata(shard.GetArchivalMetadata()),
)
}
3 changes: 2 additions & 1 deletion service/history/workflow/task_generator_test.go
Expand Up @@ -298,7 +298,8 @@ func TestTaskGeneratorImpl_GenerateWorkflowCloseTasks(t *testing.T) {
return cfg
}).AnyTimes()

taskGenerator := NewTaskGenerator(namespaceRegistry, mutableState, cfg, archivalMetadata)
taskGenerator := NewTaskGenerator(namespaceRegistry, mutableState, cfg,
WithArchivalMetadata(archivalMetadata))
err := taskGenerator.GenerateWorkflowCloseTasks(&historypb.HistoryEvent{
Attributes: &historypb.HistoryEvent_WorkflowExecutionCompletedEventAttributes{
WorkflowExecutionCompletedEventAttributes: &historypb.WorkflowExecutionCompletedEventAttributes{},
Expand Down

0 comments on commit 58fb5a2

Please sign in to comment.