From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 28 May 2025 21:07:55 +0000 (-0700)
Subject: Merge pull request #61825 from thuvh/wip-69372-reef
X-Git-Tag: v18.2.8~10^2~207
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=454220dc888641bd7f693d8e529fe903f4081eb3;p=ceph.git

Merge pull request #61825 from thuvh/wip-69372-reef

reef: rgw: allow bucket notification send message to kafka with multiple br…

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
---

454220dc888641bd7f693d8e529fe903f4081eb3
diff --cc src/test/rgw/bucket_notification/test_bn.py
index c09b6e247cd,a33e47c67da..37a0c24af6a
--- a/src/test/rgw/bucket_notification/test_bn.py
+++ b/src/test/rgw/bucket_notification/test_bn.py
@@@ -425,13 -425,20 +425,21 @@@ class KafkaReceiver(object)
          if security_type != 'PLAINTEXT':
              security_type = 'SSL'
              port = 9093
+ 
+         if kafka_server is None:
+             endpoint = "localhost" + ":" + str(port)
+         elif ":" not in kafka_server:
+             endpoint = kafka_server + ":" + str(port)
+         else:
+             endpoint = kafka_server
+ 
          while remaining_retries > 0:
              try:
-                 self.consumer = KafkaConsumer(topic, 
-                         bootstrap_servers = kafka_server+':'+str(port), 
+                 self.consumer = KafkaConsumer(topic,
+                         bootstrap_servers=endpoint,
                          security_protocol=security_type,
 -                        consumer_timeout_ms=16000)
 +                        consumer_timeout_ms=16000,
 +                        auto_offset_reset='earliest')
                  print('Kafka consumer created on topic: '+topic)
                  break
              except Exception as error: