Skip to content

Commit 2d17cb8

Browse files
authored
Replicate custom search attributes aliases with namespace replication (#3922)
1 parent 304bc98 commit 2d17cb8

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

common/namespace/replicationTaskExecutor.go

+12-10
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,12 @@ func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceCreationReplicatio
164164
Data: task.Info.Data,
165165
},
166166
Config: &persistencespb.NamespaceConfig{
167-
Retention: task.Config.GetWorkflowExecutionRetentionTtl(),
168-
HistoryArchivalState: task.Config.GetHistoryArchivalState(),
169-
HistoryArchivalUri: task.Config.GetHistoryArchivalUri(),
170-
VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
171-
VisibilityArchivalUri: task.Config.GetVisibilityArchivalUri(),
167+
Retention: task.Config.GetWorkflowExecutionRetentionTtl(),
168+
HistoryArchivalState: task.Config.GetHistoryArchivalState(),
169+
HistoryArchivalUri: task.Config.GetHistoryArchivalUri(),
170+
VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
171+
VisibilityArchivalUri: task.Config.GetVisibilityArchivalUri(),
172+
CustomSearchAttributeAliases: task.Config.GetCustomSearchAttributeAliases(),
172173
},
173174
ReplicationConfig: &persistencespb.NamespaceReplicationConfig{
174175
ActiveClusterName: task.ReplicationConfig.GetActiveClusterName(),
@@ -279,11 +280,12 @@ func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceUpdateReplicationT
279280
Data: task.Info.Data,
280281
}
281282
request.Namespace.Config = &persistencespb.NamespaceConfig{
282-
Retention: task.Config.GetWorkflowExecutionRetentionTtl(),
283-
HistoryArchivalState: task.Config.GetHistoryArchivalState(),
284-
HistoryArchivalUri: task.Config.GetHistoryArchivalUri(),
285-
VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
286-
VisibilityArchivalUri: task.Config.GetVisibilityArchivalUri(),
283+
Retention: task.Config.GetWorkflowExecutionRetentionTtl(),
284+
HistoryArchivalState: task.Config.GetHistoryArchivalState(),
285+
HistoryArchivalUri: task.Config.GetHistoryArchivalUri(),
286+
VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
287+
VisibilityArchivalUri: task.Config.GetVisibilityArchivalUri(),
288+
CustomSearchAttributeAliases: task.Config.GetCustomSearchAttributeAliases(),
287289
}
288290
if task.Config.GetBadBinaries() != nil {
289291
request.Namespace.Config.BadBinaries = task.Config.GetBadBinaries()

common/namespace/transmissionTaskHandler.go

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ func (namespaceReplicator *namespaceReplicatorImpl) HandleTransmissionTask(
118118
VisibilityArchivalState: config.VisibilityArchivalState,
119119
VisibilityArchivalUri: config.VisibilityArchivalUri,
120120
BadBinaries: config.BadBinaries,
121+
CustomSearchAttributeAliases: config.CustomSearchAttributeAliases,
121122
},
122123
ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
123124
ActiveClusterName: replicationConfig.ActiveClusterName,

service/frontend/namespace_handler.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,13 @@ func (d *namespaceHandlerImpl) RegisterNamespace(
237237
Data: registerRequest.Data,
238238
}
239239
config := &persistencespb.NamespaceConfig{
240-
Retention: registerRequest.GetWorkflowExecutionRetentionPeriod(),
241-
HistoryArchivalState: nextHistoryArchivalState.State,
242-
HistoryArchivalUri: nextHistoryArchivalState.URI,
243-
VisibilityArchivalState: nextVisibilityArchivalState.State,
244-
VisibilityArchivalUri: nextVisibilityArchivalState.URI,
245-
BadBinaries: &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
240+
Retention: registerRequest.GetWorkflowExecutionRetentionPeriod(),
241+
HistoryArchivalState: nextHistoryArchivalState.State,
242+
HistoryArchivalUri: nextHistoryArchivalState.URI,
243+
VisibilityArchivalState: nextVisibilityArchivalState.State,
244+
VisibilityArchivalUri: nextVisibilityArchivalState.URI,
245+
BadBinaries: &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
246+
CustomSearchAttributeAliases: nil,
246247
}
247248
replicationConfig := &persistencespb.NamespaceReplicationConfig{
248249
ActiveClusterName: activeClusterName,
@@ -720,6 +721,7 @@ func (d *namespaceHandlerImpl) createResponse(
720721
VisibilityArchivalState: config.VisibilityArchivalState,
721722
VisibilityArchivalUri: config.VisibilityArchivalUri,
722723
BadBinaries: config.BadBinaries,
724+
CustomSearchAttributeAliases: config.CustomSearchAttributeAliases,
723725
}
724726

725727
var clusters []*replicationpb.ClusterReplicationConfig

0 commit comments

Comments
 (0)