Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changing the REST proxy consumer client id to be plain string instead of tuple #918

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Changing the REST proxy consumer client id to be plain string instead of tuple #918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions karapace/kafka_rest_apis/consumer_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ def _illegal_state_fail(message: str, content_type: str) -> None:
# CONSUMER
async def create_consumer(self, group_name: str, request_data: dict, content_type: str):
group_name = group_name.strip("/")
consumer_name = request_data.get("name") or new_name()
internal_name = self.create_internal_name(group_name, consumer_name)
consumer_name: str = request_data.get("name") or new_name()
internal_name: Tuple[str, str] = self.create_internal_name(group_name, consumer_name)
async with self.consumer_locks[internal_name]:
if internal_name in self.consumers:
LOG.warning(
Expand Down Expand Up @@ -191,7 +191,7 @@ async def create_consumer(self, group_name: str, request_data: dict, content_typ
request_data["auto.commit.enable"] = enable_commit
request_data["auto.offset.reset"] = request_data.get("auto.offset.reset", "earliest")
fetch_min_bytes = request_data.get("fetch.min.bytes", self.config["fetch_min_bytes"])
c = await self.create_kafka_consumer(fetch_min_bytes, group_name, internal_name, request_data)
c = await self.create_kafka_consumer(fetch_min_bytes, group_name, consumer_name, request_data)
except KafkaConfigurationError as e:
KarapaceBase.internal_error(str(e), content_type)
self.consumers[internal_name] = TypedConsumer(
Expand All @@ -200,7 +200,7 @@ async def create_consumer(self, group_name: str, request_data: dict, content_typ
consumer_base_uri = urljoin(self.base_uri, f"consumers/{group_name}/instances/{consumer_name}")
KarapaceBase.r(content_type=content_type, body={"base_uri": consumer_base_uri, "instance_id": consumer_name})

async def create_kafka_consumer(self, fetch_min_bytes, group_name, internal_name, request_data):
async def create_kafka_consumer(self, fetch_min_bytes, group_name, client_id: str, request_data):
for retry in [True, True, False]:
try:
session_timeout_ms = self.config["session_timeout_ms"]
Expand All @@ -212,7 +212,7 @@ async def create_kafka_consumer(self, fetch_min_bytes, group_name, internal_name
c = AsyncKafkaConsumer(
bootstrap_servers=self.config["bootstrap_uri"],
auto_offset_reset=request_data["auto.offset.reset"],
client_id=internal_name,
client_id=client_id,
enable_auto_commit=request_data["auto.commit.enable"],
fetch_max_wait_ms=self.config.get("consumer_fetch_max_wait_ms"),
fetch_message_max_bytes=self.config["consumer_request_max_bytes"],
Expand Down
Loading