Revert "Store explicit TaskList partition data (#6591)" (#6625)

This reverts commit eebf656.
cadence-workflow · Jan 15, 2025 · bf9f526 · bf9f526
1 parent 7f5bb88
commit bf9f526
Show file tree

Hide file tree

Showing 36 changed files with 918 additions and 2,517 deletions.
diff --git a/.gen/proto/matching/v1/service.pb.go b/.gen/proto/matching/v1/service.pb.go
diff --git a/.gen/proto/matching/v1/service.pb.yarpc.go b/.gen/proto/matching/v1/service.pb.yarpc.go
diff --git a/client/matching/client_test.go b/client/matching/client_test.go
@@ -604,20 +604,9 @@ func testMatchingUpdateTaskListPartitionConfigRequest() *types.MatchingUpdateTas
 		DomainUUID: _testDomainUUID,
 		TaskList:   &types.TaskList{Name: _testTaskList},
 		PartitionConfig: &types.TaskListPartitionConfig{
-			Version: 1,
-			ReadPartitions: map[int]*types.TaskListPartition{
-				0: {},
-				1: {},
-				2: {
-					IsolationGroups: []string{"foo"},
-				},
-			},
-			WritePartitions: map[int]*types.TaskListPartition{
-				0: {},
-				1: {
-					IsolationGroups: []string{"bar"},
-				},
-			},
+			Version:            1,
+			NumReadPartitions:  3,
+			NumWritePartitions: 2,
 		},
 	}
 }
@@ -627,20 +616,9 @@ func testMatchingRefreshTaskListPartitionConfigRequest() *types.MatchingRefreshT
 		DomainUUID: _testDomainUUID,
 		TaskList:   &types.TaskList{Name: _testTaskList},
 		PartitionConfig: &types.TaskListPartitionConfig{
-			Version: 1,
-			ReadPartitions: map[int]*types.TaskListPartition{
-				0: {},
-				1: {},
-				2: {
-					IsolationGroups: []string{"foo"},
-				},
-			},
-			WritePartitions: map[int]*types.TaskListPartition{
-				0: {},
-				1: {
-					IsolationGroups: []string{"bar"},
-				},
-			},
+			Version:            1,
+			NumReadPartitions:  3,
+			NumWritePartitions: 2,
 		},
 	}
 }
diff --git a/client/matching/partition_config_provider.go b/client/matching/partition_config_provider.go
@@ -112,8 +112,8 @@ func (p *partitionConfigProviderImpl) GetNumberOfReadPartitions(domainID string,
 	}
 	c.RLock()
 	v := c.Version
-	w := len(c.WritePartitions)
-	r := len(c.ReadPartitions)
+	w := c.NumWritePartitions
+	r := c.NumReadPartitions
 	c.RUnlock()
 	scope := p.metricsClient.Scope(metrics.PartitionConfigProviderScope, metrics.DomainTag(domainName), metrics.TaskListRootPartitionTag(taskList.GetName()), getTaskListTypeTag(taskListType))
 	scope.UpdateGauge(metrics.TaskListPartitionConfigNumReadGauge, float64(r))
@@ -142,8 +142,8 @@ func (p *partitionConfigProviderImpl) GetNumberOfWritePartitions(domainID string
 	}
 	c.RLock()
 	v := c.Version
-	w := len(c.WritePartitions)
-	r := len(c.ReadPartitions)
+	w := c.NumWritePartitions
+	r := c.NumReadPartitions
 	c.RUnlock()
 	scope := p.metricsClient.Scope(metrics.PartitionConfigProviderScope, metrics.DomainTag(domainName), metrics.TaskListRootPartitionTag(taskList.GetName()), getTaskListTypeTag(taskListType))
 	scope.UpdateGauge(metrics.TaskListPartitionConfigNumReadGauge, float64(r))
@@ -180,9 +180,7 @@ func (p *partitionConfigProviderImpl) UpdatePartitionConfig(domainID string, tas
 	}
 	updated := c.updateConfig(*config)
 	if updated {
-		w := len(c.WritePartitions)
-		r := len(c.ReadPartitions)
-		p.logger.Info("tasklist partition config updated", tag.WorkflowDomainID(domainID), tag.WorkflowTaskListName(taskList.Name), tag.WorkflowTaskListType(taskListType), tag.Dynamic("read-partition", r), tag.Dynamic("write-partition", w), tag.Dynamic("config-version", config.Version))
+		p.logger.Info("tasklist partition config updated", tag.WorkflowDomainID(domainID), tag.WorkflowTaskListName(taskList.Name), tag.WorkflowTaskListType(taskListType), tag.Dynamic("read-partition", config.NumReadPartitions), tag.Dynamic("write-partition", config.NumWritePartitions), tag.Dynamic("config-version", config.Version))
 	}
 }
 

diff --git a/client/matching/partition_config_provider_test.go b/client/matching/partition_config_provider_test.go
@@ -136,7 +136,7 @@ func TestGetNumberOfReadPartitions(t *testing.T) {
 			if tc.enableReadFromCache && tc.taskListKind == types.TaskListKindNormal {
 				if tc.cachedConfigExists {
 					mockCache.EXPECT().Get(gomock.Any()).Return(&syncedTaskListPartitionConfig{
-						TaskListPartitionConfig: types.TaskListPartitionConfig{ReadPartitions: partitions(4)},
+						TaskListPartitionConfig: types.TaskListPartitionConfig{NumReadPartitions: 4},
 					}).Times(1)
 				} else {
 					mockCache.EXPECT().Get(gomock.Any()).Return(nil).Times(1)
@@ -145,10 +145,10 @@ func TestGetNumberOfReadPartitions(t *testing.T) {
 
 			kind := tc.taskListKind
 			taskList := types.TaskList{Name: "test-task-list", Kind: &kind}
-			p := partitionProvider.GetNumberOfReadPartitions("test-domain-id", taskList, 0)
+			partitions := partitionProvider.GetNumberOfReadPartitions("test-domain-id", taskList, 0)
 
 			// Validate result
-			assert.Equal(t, tc.expectedPartitions, p)
+			assert.Equal(t, tc.expectedPartitions, partitions)
 		})
 	}
 }
@@ -196,18 +196,18 @@ func TestGetNumberOfWritePartitions(t *testing.T) {
 			if tc.enableReadFromCache && tc.taskListKind == types.TaskListKindNormal {
 				if tc.cachedConfigExists {
 					mockCache.EXPECT().Get(gomock.Any()).Return(&syncedTaskListPartitionConfig{
-						TaskListPartitionConfig: types.TaskListPartitionConfig{ReadPartitions: partitions(2), WritePartitions: partitions(5)},
+						TaskListPartitionConfig: types.TaskListPartitionConfig{NumReadPartitions: 2, NumWritePartitions: 5},
 					}).Times(1)
 				} else {
 					mockCache.EXPECT().Get(gomock.Any()).Return(nil).Times(1)
 				}
 			}
 			kind := tc.taskListKind
 			taskList := types.TaskList{Name: "test-task-list", Kind: &kind}
-			p := partitionProvider.GetNumberOfWritePartitions("test-domain-id", taskList, 0)
+			partitions := partitionProvider.GetNumberOfWritePartitions("test-domain-id", taskList, 0)
 
 			// Validate result
-			assert.Equal(t, tc.expectedPartitions, p)
+			assert.Equal(t, tc.expectedPartitions, partitions)
 		})
 	}
 }
@@ -253,11 +253,3 @@ func TestUpdatePartitionConfig(t *testing.T) {
 		})
 	}
 }
-
-func partitions(num int) map[int]*types.TaskListPartition {
-	result := make(map[int]*types.TaskListPartition, num)
-	for i := 0; i < num; i++ {
-		result[i] = &types.TaskListPartition{}
-	}
-	return result
-}
diff --git a/common/clock/sustain.go b/common/clock/sustain.go
diff --git a/common/clock/sustain_test.go b/common/clock/sustain_test.go
diff --git a/common/log/tag/tags.go b/common/log/tag/tags.go
@@ -1034,20 +1034,20 @@ func CurrentQPS(qps float64) Tag {
 	return newFloat64Tag("current-qps", qps)
 }
 
-func NumReadPartitions(n int) Tag {
-	return newInt("num-read-partitions", n)
+func NumReadPartitions(n int32) Tag {
+	return newInt32("num-read-partitions", n)
 }
 
-func NumWritePartitions(n int) Tag {
-	return newInt("num-write-partitions", n)
+func NumWritePartitions(n int32) Tag {
+	return newInt32("num-write-partitions", n)
 }
 
-func CurrentNumReadPartitions(n int) Tag {
-	return newInt("current-num-read-partitions", n)
+func CurrentNumReadPartitions(n int32) Tag {
+	return newInt32("current-num-read-partitions", n)
 }
 
-func CurrentNumWritePartitions(n int) Tag {
-	return newInt("current-num-write-partitions", n)
+func CurrentNumWritePartitions(n int32) Tag {
+	return newInt32("current-num-write-partitions", n)
 }
 
 func PartitionUpscaleThreshold(qps float64) Tag {