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

Replicate custom search attributes aliases with namespace replication #3922

Merged
merged 1 commit into from
Feb 9, 2023
Merged

Replicate custom search attributes aliases with namespace replication #3922

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
22 changes: 12 additions & 10 deletions common/namespace/replicationTaskExecutor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,12 @@ func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceCreationReplicatio
Data: task.Info.Data,
},
Config: &persistencespb.NamespaceConfig{
Retention: task.Config.GetWorkflowExecutionRetentionTtl(),
HistoryArchivalState: task.Config.GetHistoryArchivalState(),
HistoryArchivalUri: task.Config.GetHistoryArchivalUri(),
VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
VisibilityArchivalUri: task.Config.GetVisibilityArchivalUri(),
Retention: task.Config.GetWorkflowExecutionRetentionTtl(),
HistoryArchivalState: task.Config.GetHistoryArchivalState(),
HistoryArchivalUri: task.Config.GetHistoryArchivalUri(),
VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
VisibilityArchivalUri: task.Config.GetVisibilityArchivalUri(),
CustomSearchAttributeAliases: task.Config.GetCustomSearchAttributeAliases(),
Comment on lines +167 to +172
Copy link
Collaborator

@rodrigozhou rodrigozhou Feb 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this!
But I wonder if there's a way to avoid this issue in the future?
I feel like every time a new field is added, it's prone have this same issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reflection? Do we need to do this deep copy at all?
At least we should be able to add test which check all fields using reflection.

},
ReplicationConfig: &persistencespb.NamespaceReplicationConfig{
ActiveClusterName: task.ReplicationConfig.GetActiveClusterName(),
Expand Down Expand Up @@ -279,11 +280,12 @@ func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceUpdateReplicationT
Data: task.Info.Data,
}
request.Namespace.Config = &persistencespb.NamespaceConfig{
Retention: task.Config.GetWorkflowExecutionRetentionTtl(),
HistoryArchivalState: task.Config.GetHistoryArchivalState(),
HistoryArchivalUri: task.Config.GetHistoryArchivalUri(),
VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
VisibilityArchivalUri: task.Config.GetVisibilityArchivalUri(),
Retention: task.Config.GetWorkflowExecutionRetentionTtl(),
HistoryArchivalState: task.Config.GetHistoryArchivalState(),
HistoryArchivalUri: task.Config.GetHistoryArchivalUri(),
VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
VisibilityArchivalUri: task.Config.GetVisibilityArchivalUri(),
CustomSearchAttributeAliases: task.Config.GetCustomSearchAttributeAliases(),
}
if task.Config.GetBadBinaries() != nil {
request.Namespace.Config.BadBinaries = task.Config.GetBadBinaries()
Expand Down
1 change: 1 addition & 0 deletions common/namespace/transmissionTaskHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ func (namespaceReplicator *namespaceReplicatorImpl) HandleTransmissionTask(
VisibilityArchivalState: config.VisibilityArchivalState,
VisibilityArchivalUri: config.VisibilityArchivalUri,
BadBinaries: config.BadBinaries,
CustomSearchAttributeAliases: config.CustomSearchAttributeAliases,
},
ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
ActiveClusterName: replicationConfig.ActiveClusterName,
Expand Down
14 changes: 8 additions & 6 deletions service/frontend/namespace_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,13 @@ func (d *namespaceHandlerImpl) RegisterNamespace(
Data: registerRequest.Data,
}
config := &persistencespb.NamespaceConfig{
Retention: registerRequest.GetWorkflowExecutionRetentionPeriod(),
HistoryArchivalState: nextHistoryArchivalState.State,
HistoryArchivalUri: nextHistoryArchivalState.URI,
VisibilityArchivalState: nextVisibilityArchivalState.State,
VisibilityArchivalUri: nextVisibilityArchivalState.URI,
BadBinaries: &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
Retention: registerRequest.GetWorkflowExecutionRetentionPeriod(),
HistoryArchivalState: nextHistoryArchivalState.State,
HistoryArchivalUri: nextHistoryArchivalState.URI,
VisibilityArchivalState: nextVisibilityArchivalState.State,
VisibilityArchivalUri: nextVisibilityArchivalState.URI,
BadBinaries: &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
CustomSearchAttributeAliases: nil,
}
replicationConfig := &persistencespb.NamespaceReplicationConfig{
ActiveClusterName: activeClusterName,
Expand Down Expand Up @@ -720,6 +721,7 @@ func (d *namespaceHandlerImpl) createResponse(
VisibilityArchivalState: config.VisibilityArchivalState,
VisibilityArchivalUri: config.VisibilityArchivalUri,
BadBinaries: config.BadBinaries,
CustomSearchAttributeAliases: config.CustomSearchAttributeAliases,
}

var clusters []*replicationpb.ClusterReplicationConfig
Expand Down