Fix issue that elastic search cannot handle values with different typ…

…e for the same key. (cadence-workflow#1397)
marcusbooyah · Jan 17, 2019 · 8d81a07 · 8d81a07
1 parent a3634d6
commit 8d81a07
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/common/logging/tags.go b/common/logging/tags.go
@@ -36,6 +36,7 @@ const (
 	TagHistoryBuilderAction       = "history-builder-action"
 	TagStoreOperation             = "store-operation"
 	TagDomainID                   = "domain-id"
+	TagDomainIDs                  = "domain-ids"
 	TagWorkflowExecutionID        = "execution-id"
 	TagWorkflowRunID              = "run-id"
 	TagHistoryShardID             = "shard-id"

diff --git a/service/history/historyEngine.go b/service/history/historyEngine.go
@@ -264,7 +264,7 @@ func (e *historyEngineImpl) registerDomainFailoverCallback() {
 
 			if len(failoverDomainIDs) > 0 {
 				e.logger.WithFields(bark.Fields{
-					logging.TagDomainID: failoverDomainIDs,
+					logging.TagDomainIDs: failoverDomainIDs,
 				}).Infof("Domain Failover Start.")
 
 				e.txProcessor.FailoverDomain(failoverDomainIDs)

diff --git a/service/history/timerQueueActiveProcessor.go b/service/history/timerQueueActiveProcessor.go
@@ -139,7 +139,7 @@ func newTimerQueueFailoverProcessor(shard ShardContext, historyService *historyE
 
 	logger = logger.WithFields(bark.Fields{
 		logging.TagWorkflowCluster: currentClusterName,
-		logging.TagDomainID:        domainIDs,
+		logging.TagDomainIDs:       domainIDs,
 		logging.TagFailover:        "from: " + standbyClusterName,
 	})
 	timerTaskFilter := func(timer *persistence.TimerTaskInfo) (bool, error) {

diff --git a/service/history/transferQueueActiveProcessor.go b/service/history/transferQueueActiveProcessor.go
@@ -134,7 +134,7 @@ func newTransferQueueFailoverProcessor(shard ShardContext, historyService *histo
 	failoverUUID := uuid.New()
 	logger = logger.WithFields(bark.Fields{
 		logging.TagWorkflowCluster: currentClusterName,
-		logging.TagDomainID:        domainIDs,
+		logging.TagDomainIDs:       domainIDs,
 		logging.TagFailover:        "from: " + standbyClusterName,
 	})
 	transferTaskFilter := func(task *persistence.TransferTaskInfo) (bool, error) {