CreateTopics: only suppress topic already exists errors

Author: rhansen2

createtopics.go

@@ -3,7 +3,6 @@ package kafka
 import (
 	"bufio"
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"time"
@@ -65,7 +64,6 @@ func (c *Client) CreateTopics(ctx context.Context, req *CreateTopicsRequest) (*C
 		TimeoutMs:    c.timeoutMs(ctx, defaultCreateTopicsTimeout),
 		ValidateOnly: req.ValidateOnly,
 	})
-
 	if err != nil {
 		return nil, fmt.Errorf("kafka.(*Client).CreateTopics: %w", err)
 	}
@@ -363,6 +361,9 @@ func (c *Conn) createTopics(request createTopicsRequestV0) (createTopicsResponse
 		return response, err
 	}
 	for _, tr := range response.TopicErrors {
+		if tr.ErrorCode == int16(TopicAlreadyExists) {
+			continue
+		}
 		if tr.ErrorCode != 0 {
 			return response, Error(tr.ErrorCode)
 		}
@@ -385,14 +386,5 @@ func (c *Conn) CreateTopics(topics ...TopicConfig) error {
 	_, err := c.createTopics(createTopicsRequestV0{
 		Topics: requestV0Topics,
 	})
-	if err != nil {
-		if errors.Is(err, TopicAlreadyExists) {
-			// ok
-			return nil
-		}
-
-		return err
-	}
-
-	return nil
+	return err
 }

createtopics_test.go

@@ -4,10 +4,80 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"errors"
+	"net"
 	"reflect"
+	"strconv"
 	"testing"
 )
 
+func TestConnCreateTopics(t *testing.T) {
+	topic1 := makeTopic()
+	topic2 := makeTopic()
+
+	conn, err := DialContext(context.Background(), "tcp", "localhost:9092")
+	defer conn.Close()
+	if err != nil {
+		panic(err)
+	}
+
+	controller, _ := conn.Controller()
+
+	controllerConn, err := Dial("tcp", net.JoinHostPort(controller.Host, strconv.Itoa(controller.Port)))
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer controllerConn.Close()
+
+	err = controllerConn.CreateTopics(TopicConfig{
+		Topic:             topic1,
+		NumPartitions:     1,
+		ReplicationFactor: 1,
+	})
+	if err != nil {
+		t.Fatalf("unexpected error creating topic: %s", err.Error())
+	}
+
+	err = controllerConn.CreateTopics(TopicConfig{
+		Topic:             topic1,
+		NumPartitions:     1,
+		ReplicationFactor: 1,
+	})
+
+	// Duplicate topic should not return an error
+	if err != nil {
+		t.Fatalf("unexpected error creating duplicate topic topic: %v", err)
+	}
+
+	err = controllerConn.CreateTopics(
+		TopicConfig{
+			Topic:             topic1,
+			NumPartitions:     1,
+			ReplicationFactor: 1,
+		},
+		TopicConfig{
+			Topic:             topic2,
+			NumPartitions:     1,
+			ReplicationFactor: 1,
+		},
+		TopicConfig{
+			Topic:             topic2,
+			NumPartitions:     1,
+			ReplicationFactor: 1,
+		},
+	)
+
+	if err == nil {
+		t.Fatal("CreateTopics should have returned an error for invalid requests")
+	}
+
+	if !errors.Is(err, InvalidRequest) {
+		t.Fatalf("expected invalid request: %v", err)
+	}
+
+	deleteTopic(t, topic1, topic2)
+}
+
 func TestClientCreateTopics(t *testing.T) {
 	const (
 		topic1 = "client-topic-1"
@@ -59,7 +129,6 @@ func TestClientCreateTopics(t *testing.T) {
 			},
 		},
 	})
-
 	if err != nil {
 		t.Fatal(err)
 	}