Fix cache

Author: Shaddoll

common/cache/domainCache.go

@@ -771,7 +771,6 @@ func (entry *DomainCacheEntry) duplicate() *DomainCacheEntry {
 	result.failoverEndTime = entry.failoverEndTime
 	result.notificationVersion = entry.notificationVersion
 	result.initialized = entry.initialized
-	result.activeClusters = entry.activeClusters
 	return result
 }
 
@@ -904,9 +903,11 @@ func (entry *DomainCacheEntry) IsActiveIn(currentCluster string) bool {
 	}
 
 	if entry.GetReplicationConfig().IsActiveActive() {
-		for _, cl := range entry.GetReplicationConfig().ActiveClusters.ActiveClustersByRegion {
-			if cl.ActiveClusterName == currentCluster {
-				return true
+		for _, scope := range entry.GetReplicationConfig().ActiveClusters.AttributeScopes {
+			for _, cl := range scope.ClusterAttributes {
+				if cl.ActiveClusterName == currentCluster {
+					return true
+				}
 			}
 		}
 
@@ -1064,9 +1065,11 @@ func getActiveClusters(replicationConfig *persistence.DomainReplicationConfig) [
 	if !replicationConfig.IsActiveActive() {
 		return nil
 	}
-	activeClusters := make([]string, 0, len(replicationConfig.ActiveClusters.ActiveClustersByRegion))
-	for _, cl := range replicationConfig.ActiveClusters.ActiveClustersByRegion {
-		activeClusters = append(activeClusters, cl.ActiveClusterName)
+	activeClusters := make([]string, 0, len(replicationConfig.ActiveClusters.AttributeScopes))
+	for _, scope := range replicationConfig.ActiveClusters.AttributeScopes {
+		for _, cl := range scope.ClusterAttributes {
+			activeClusters = append(activeClusters, cl.ActiveClusterName)
+		}
 	}
 	sort.Strings(activeClusters)
 	return activeClusters

common/cache/domainCache_test.go

@@ -330,9 +330,13 @@ func Test_IsActiveIn(t *testing.T) {
 			isGlobalDomain: true,
 			currentCluster: "A",
 			activeClusters: &types.ActiveClusters{
-				ActiveClustersByRegion: map[string]types.ActiveClusterInfo{
-					"region0": {ActiveClusterName: "A"},
-					"region1": {ActiveClusterName: "B"},
+				AttributeScopes: map[string]types.ClusterAttributeScope{
+					"region": {
+						ClusterAttributes: map[string]types.ActiveClusterInfo{
+							"region0": {ActiveClusterName: "A"},
+							"region1": {ActiveClusterName: "B"},
+						},
+					},
 				},
 			},
 			expectIsActive: true,
@@ -342,9 +346,13 @@ func Test_IsActiveIn(t *testing.T) {
 			isGlobalDomain: true,
 			currentCluster: "C",
 			activeClusters: &types.ActiveClusters{
-				ActiveClustersByRegion: map[string]types.ActiveClusterInfo{
-					"region0": {ActiveClusterName: "A"},
-					"region1": {ActiveClusterName: "B"},
+				AttributeScopes: map[string]types.ClusterAttributeScope{
+					"region": {
+						ClusterAttributes: map[string]types.ActiveClusterInfo{
+							"region0": {ActiveClusterName: "A"},
+							"region1": {ActiveClusterName: "B"},
+						},
+					},
 				},
 			},
 			expectIsActive: false,
@@ -1223,14 +1231,16 @@ func Test_NewDomainNotActiveError(t *testing.T) {
 				nil,
 				true,
 				&persistence.DomainReplicationConfig{
-					ActiveClusters: &types.ActiveClusters{ActiveClustersByRegion: map[string]types.ActiveClusterInfo{
-						"region1": {
-							ActiveClusterName: "cluster1",
-						},
-						"region2": {
-							ActiveClusterName: "cluster2",
+					ActiveClusters: &types.ActiveClusters{
+						AttributeScopes: map[string]types.ClusterAttributeScope{
+							"region": {
+								ClusterAttributes: map[string]types.ActiveClusterInfo{
+									"region1": {ActiveClusterName: "cluster1"},
+									"region2": {ActiveClusterName: "cluster2"},
+								},
+							},
 						},
-					}},
+					},
 				},
 				0,
 				nil,
@@ -1273,14 +1283,16 @@ func Test_getActiveClusters(t *testing.T) {
 			msg: "active-active domain",
 			replicationConfig: &persistence.DomainReplicationConfig{
 				ActiveClusterName: "active",
-				ActiveClusters: &types.ActiveClusters{ActiveClustersByRegion: map[string]types.ActiveClusterInfo{
-					"region1": {
-						ActiveClusterName: "cluster1",
-					},
-					"region2": {
-						ActiveClusterName: "cluster2",
+				ActiveClusters: &types.ActiveClusters{
+					AttributeScopes: map[string]types.ClusterAttributeScope{
+						"region": {
+							ClusterAttributes: map[string]types.ActiveClusterInfo{
+								"region1": {ActiveClusterName: "cluster1"},
+								"region2": {ActiveClusterName: "cluster2"},
+							},
+						},
 					},
-				}},
+				},
 			},
 			expectedActiveClusters: []string{"cluster1", "cluster2"},
 		},

common/types/shared.go

@@ -2600,8 +2600,13 @@ func (v *ActiveClusters) DeepCopy() *ActiveClusters {
 	for region, activeClusterInfo := range v.ActiveClustersByRegion {
 		activeClustersByRegion[region] = activeClusterInfo
 	}
+	attributeScopes := make(map[string]ClusterAttributeScope)
+	for scopeType, scope := range v.AttributeScopes {
+		attributeScopes[scopeType] = scope
+	}
 	return &ActiveClusters{
 		ActiveClustersByRegion: activeClustersByRegion,
+		AttributeScopes:        attributeScopes,
 	}
 }
 

common/types/shared_test.go

@@ -84,6 +84,13 @@ func TestActiveClustersConfigDeepCopy(t *testing.T) {
 				FailoverVersion:   2,
 			},
 		},
+		AttributeScopes: map[string]ClusterAttributeScope{
+			"region": {
+				ClusterAttributes: map[string]ActiveClusterInfo{
+					"us-east-1": {ActiveClusterName: "us-east-1-cluster", FailoverVersion: 1},
+				},
+			},
+		},
 	}
 
 	tests := []struct {
@@ -101,6 +108,7 @@ func TestActiveClustersConfigDeepCopy(t *testing.T) {
 			input: &ActiveClusters{},
 			expect: &ActiveClusters{
 				ActiveClustersByRegion: map[string]ActiveClusterInfo{},
+				AttributeScopes:        map[string]ClusterAttributeScope{},
 			},
 		},
 		{