kafka(ticdc): sarama admin client fetch metadata by cache (pingcap#9511…

…) (pingcap#9551)

close pingcap#9504

cdc/sink/dmlsink/mq/manager/kafka_manager.go

@@ -58,7 +58,7 @@ func NewKafkaTopicManager(
 	ctx context.Context,
 	admin kafka.ClusterAdminClient,
 	cfg *kafka.AutoCreateTopicConfig,
-) (*kafkaTopicManager, error) {
+) *kafkaTopicManager {
 	changefeedID := contextutil.ChangefeedIDFromCtx(ctx)
 	mgr := &kafkaTopicManager{
 		changefeedID:      changefeedID,
@@ -71,7 +71,7 @@ func NewKafkaTopicManager(
 	// Background refresh metadata.
 	go mgr.backgroundRefreshMeta(ctx)
 
-	return mgr, nil
+	return mgr
 }
 
 // GetPartitionNum returns the number of partitions of the topic.
@@ -103,20 +103,12 @@ func (m *kafkaTopicManager) backgroundRefreshMeta(ctx context.Context) {
 			)
 			return
 		case <-m.metaRefreshTicker.C:
-			topicMetaList, err := m.getMetadataOfTopics(ctx)
 			// We ignore the error here, because the error may be caused by the
 			// network problem, and we can try to get the metadata next time.
-			if err != nil {
-				log.Warn("Get metadata of topics failed",
-					zap.String("namespace", m.changefeedID.Namespace),
-					zap.String("changefeed", m.changefeedID.ID),
-					zap.Error(err))
+			topicPartitionNums, _ := m.fetchAllTopicsPartitionsNum(ctx)
+			for topic, partitionNum := range topicPartitionNums {
+				m.tryUpdatePartitionsAndLogging(topic, partitionNum)
 			}
-
-			for topic, detail := range topicMetaList {
-				m.tryUpdatePartitionsAndLogging(topic, detail.NumPartitions)
-			}
-
 		}
 	}
 }
@@ -148,21 +140,21 @@ func (m *kafkaTopicManager) tryUpdatePartitionsAndLogging(topic string, partitio
 	}
 }
 
-func (m *kafkaTopicManager) getMetadataOfTopics(
+// fetchAllTopicsPartitionsNum fetches all topics' partitions number.
+// The error returned by this method could be a transient error that is fixable by the underlying logic.
+// When handling this error, please be cautious.
+// If you simply throw the error to the caller, it may impact the robustness of your program.
+func (m *kafkaTopicManager) fetchAllTopicsPartitionsNum(
 	ctx context.Context,
-) (map[string]kafka.TopicDetail, error) {
-	var topicList []string
-
+) (map[string]int32, error) {
+	var topics []string
 	m.topics.Range(func(key, value any) bool {
-		topic := key.(string)
-		topicList = append(topicList, topic)
-
+		topics = append(topics, key.(string))
 		return true
 	})
 
 	start := time.Now()
-	// ignore the topic with error, return a subset of all topics.
-	topicMetaList, err := m.admin.GetTopicsMeta(ctx, topicList, true)
+	numPartitions, err := m.admin.GetTopicsPartitionsNum(ctx, topics)
 	if err != nil {
 		log.Warn(
 			"Kafka admin client describe topics failed",
@@ -180,7 +172,7 @@ func (m *kafkaTopicManager) getMetadataOfTopics(
 		zap.String("changefeed", m.changefeedID.ID),
 		zap.Duration("duration", time.Since(start)))
 
-	return topicMetaList, nil
+	return numPartitions, nil
 }
 
 // waitUntilTopicVisible is called after CreateTopic to make sure the topic
@@ -195,6 +187,8 @@ func (m *kafkaTopicManager) waitUntilTopicVisible(
 	topics := []string{topicName}
 	err := retry.Do(ctx, func() error {
 		start := time.Now()
+		// ignoreTopicError is set to false since we just create the topic,
+		// make sure the topic is visible.
 		meta, err := m.admin.GetTopicsMeta(ctx, topics, false)
 		if err != nil {
 			log.Warn(" topic not found, retry it",
@@ -268,10 +262,11 @@ func (m *kafkaTopicManager) createTopic(
 
 // CreateTopicAndWaitUntilVisible wraps createTopic and waitUntilTopicVisible together.
 func (m *kafkaTopicManager) CreateTopicAndWaitUntilVisible(
-	ctx context.Context,
-	topicName string,
+	ctx context.Context, topicName string,
 ) (int32, error) {
 	// If the topic is not in the cache, we try to get the metadata of the topic.
+	// ignoreTopicErr is set to true to ignore the error if the topic is not found,
+	// which means we should create the topic later.
 	topicDetails, err := m.admin.GetTopicsMeta(ctx, []string{topicName}, true)
 	if err != nil {
 		return 0, errors.Trace(err)

cdc/sink/dmlsink/mq/manager/kafka_manager_test.go

@@ -33,8 +33,7 @@ func TestPartitions(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	manager, err := NewKafkaTopicManager(ctx, adminClient, cfg)
-	require.Nil(t, err)
+	manager := NewKafkaTopicManager(ctx, adminClient, cfg)
 	defer manager.Close()
 
 	partitionsNum, err := manager.GetPartitionNum(
@@ -56,8 +55,7 @@ func TestCreateTopic(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	manager, err := NewKafkaTopicManager(ctx, adminClient, cfg)
-	require.Nil(t, err)
+	manager := NewKafkaTopicManager(ctx, adminClient, cfg)
 	defer manager.Close()
 	partitionNum, err := manager.CreateTopicAndWaitUntilVisible(ctx, kafka.DefaultMockTopicName)
 	require.Nil(t, err)
@@ -72,8 +70,7 @@ func TestCreateTopic(t *testing.T) {
 
 	// Try to create a topic without auto create.
 	cfg.AutoCreate = false
-	manager, err = NewKafkaTopicManager(ctx, adminClient, cfg)
-	require.Nil(t, err)
+	manager = NewKafkaTopicManager(ctx, adminClient, cfg)
 	defer manager.Close()
 	_, err = manager.CreateTopicAndWaitUntilVisible(ctx, "new-topic2")
 	require.Regexp(
@@ -89,8 +86,7 @@ func TestCreateTopic(t *testing.T) {
 		PartitionNum:      2,
 		ReplicationFactor: 4,
 	}
-	manager, err = NewKafkaTopicManager(ctx, adminClient, cfg)
-	require.Nil(t, err)
+	manager = NewKafkaTopicManager(ctx, adminClient, cfg)
 	defer manager.Close()
 	_, err = manager.CreateTopicAndWaitUntilVisible(ctx, "new-topic-failed")
 	require.Regexp(
@@ -112,8 +108,7 @@ func TestCreateTopicWithDelay(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	manager, err := NewKafkaTopicManager(ctx, adminClient, cfg)
-	require.Nil(t, err)
+	manager := NewKafkaTopicManager(ctx, adminClient, cfg)
 	defer manager.Close()
 	partitionNum, err := manager.createTopic(ctx, "new_topic")
 	require.Nil(t, err)

cdc/sink/util/helper.go

@@ -93,14 +93,9 @@ func GetTopicManagerAndTryCreateTopic(
 	topicCfg *kafka.AutoCreateTopicConfig,
 	adminClient kafka.ClusterAdminClient,
 ) (manager.TopicManager, error) {
-	topicManager, err := manager.NewKafkaTopicManager(
-		ctx,
-		adminClient,
-		topicCfg,
+	topicManager := manager.NewKafkaTopicManager(
+		ctx, adminClient, topicCfg,
 	)
-	if err != nil {
-		return nil, cerror.WrapError(cerror.ErrKafkaNewProducer, err)
-	}
 
 	if _, err := topicManager.CreateTopicAndWaitUntilVisible(ctx, topic); err != nil {
 		return nil, cerror.WrapError(cerror.ErrKafkaCreateTopic, err)