Skip to content

KAFKA-19662: Allow resetting offset for unsubscribed topic in kafka-share-groups.sh #20453

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

Merged
merged 2 commits into from
Sep 4, 2025
Merged

KAFKA-19662: Allow resetting offset for unsubscribed topic in kafka-share-groups.sh #20453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b9db36
KAFKA-19662: Share group reset offsets for unsubscribed topic
AndrewJSchofield Sep 1, 2025
19556bc
Reinstate check removed in error
AndrewJSchofield Sep 1, 2025
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
12 changes: 0 additions & 12 deletions tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,18 +418,6 @@ protected Map<TopicPartition, OffsetAndMetadata> prepareOffsetsToReset(String gr

if (opts.options.has(opts.topicOpt)) {
partitionsToReset = offsetsUtils.parseTopicPartitionsToReset(opts.options.valuesOf(opts.topicOpt));
Set<String> subscribedTopics = offsetsByTopicPartitions.keySet().stream()
.map(TopicPartition::topic)
.collect(Collectors.toSet());
Set<String> resetTopics = partitionsToReset.stream()
.map(TopicPartition::topic)
.collect(Collectors.toSet());
if (!subscribedTopics.containsAll(resetTopics)) {
CommandLineUtils
.printErrorAndExit(String.format("Share group '%s' is not subscribed to topic '%s'.",
groupId, resetTopics.stream().filter(topic -> !subscribedTopics.contains(topic)).collect(Collectors.joining(", "))));
return null;
}
} else {
partitionsToReset = offsetsByTopicPartitions.keySet();
}
Expand Down
32 changes: 16 additions & 16 deletions tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.kafka.tools.consumer.group;


import org.apache.kafka.clients.admin.Admin;
import org.apache.kafka.clients.admin.AdminClientTestUtils;
import org.apache.kafka.clients.admin.AlterShareGroupOffsetsResult;
Expand Down Expand Up @@ -1373,7 +1372,7 @@ public void testAlterShareGroupOffsetsArgsFailureWithoutResetOffsetsArgs() {
}

@Test
public void testAlterShareGroupFailureWithNonExistentTopic() {
public void testAlterShareGroupUnsubscribedTopicSuccess() {
String group = "share-group";
String topic = "none";
String bootstrapServer = "localhost:9092";
Expand All @@ -1386,18 +1385,22 @@ public void testAlterShareGroupFailureWithNonExistentTopic() {
KafkaFuture.completedFuture(Map.of(new TopicPartition("topic", 0), new OffsetAndMetadata(10L)))
)
);
when(adminClient.listShareGroupOffsets(any())).thenReturn(listShareGroupOffsetsResult);

AlterShareGroupOffsetsResult alterShareGroupOffsetsResult = mockAlterShareGroupOffsets(adminClient, group);
TopicPartition tp0 = new TopicPartition(topic, 0);
Map<TopicPartition, OffsetAndMetadata> partitionOffsets = Map.of(tp0, new OffsetAndMetadata(0L));
ListOffsetsResult listOffsetsResult = AdminClientTestUtils.createListOffsetsResult(partitionOffsets);
when(adminClient.listOffsets(any(), any(ListOffsetsOptions.class))).thenReturn(listOffsetsResult);

ShareGroupDescription exp = new ShareGroupDescription(
group,
List.of(new ShareMemberDescription("memid1", "clId1", "host1", new ShareMemberAssignment(
Set.of(new TopicPartition(topic, 0))
), 0)),
List.of(),
GroupState.EMPTY,
new Node(0, "host1", 9090), 0, 0);
DescribeShareGroupsResult describeShareGroupsResult = mock(DescribeShareGroupsResult.class);
when(describeShareGroupsResult.describedGroups()).thenReturn(Map.of(group, KafkaFuture.completedFuture(exp)));
when(adminClient.describeShareGroups(any(), any(DescribeShareGroupsOptions.class))).thenReturn(describeShareGroupsResult);
AtomicBoolean exited = new AtomicBoolean(false);
when(adminClient.listShareGroupOffsets(any())).thenReturn(listShareGroupOffsetsResult);
Map<String, TopicDescription> descriptions = Map.of(
topic, new TopicDescription(topic, false, List.of(
new TopicPartitionInfo(0, Node.noNode(), List.of(), List.of())
Expand All @@ -1406,15 +1409,12 @@ topic, new TopicDescription(topic, false, List.of(
when(describeTopicResult.allTopicNames()).thenReturn(completedFuture(descriptions));
when(adminClient.describeTopics(anyCollection())).thenReturn(describeTopicResult);
when(adminClient.describeTopics(anyCollection(), any(DescribeTopicsOptions.class))).thenReturn(describeTopicResult);
Exit.setExitProcedure(((statusCode, message) -> {
assertNotEquals(0, statusCode);
assertTrue(message.contains("Share group 'share-group' is not subscribed to topic 'none'"));
exited.set(true);
}));
try {
getShareGroupService(cgcArgs, adminClient).resetOffsets();
} finally {
assertTrue(exited.get());
try (ShareGroupService service = getShareGroupService(cgcArgs, adminClient)) {
service.resetOffsets();
verify(adminClient).alterShareGroupOffsets(eq(group), anyMap());
verify(adminClient).describeTopics(anyCollection(), any(DescribeTopicsOptions.class));
verify(alterShareGroupOffsetsResult, times(1)).all();
verify(adminClient).describeShareGroups(ArgumentMatchers.anyCollection(), any(DescribeShareGroupsOptions.class));
}
}

Expand Down