Skip to content

KAFKA-2557: separate REBALANCE_IN_PROGRESS and ILLEGAL_GENERATION error codes #222

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

Closed
onurkaraman wants to merge 1 commit into from
Closed

KAFKA-2557: separate REBALANCE_IN_PROGRESS and ILLEGAL_GENERATION error codes #222

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions clients/src/main/java/org/apache/kafka/clients/consumer/internals/Coordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,10 @@ public void handle(HeartbeatResponse heartbeatResponse, RequestFuture<Void> futu
log.info("Attempt to heart beat failed since coordinator is either not started or not valid, marking it as dead.");
coordinatorDead();
future.raise(Errors.forCode(error));
} else if (error == Errors.REBALANCE_IN_PROGRESS.code()) {
log.info("Attempt to heart beat failed since the group is rebalancing, try to re-join group.");
subscriptions.needReassignment();
future.raise(Errors.REBALANCE_IN_PROGRESS);
} else if (error == Errors.ILLEGAL_GENERATION.code()) {
log.info("Attempt to heart beat failed since generation id is not legal, try to re-join group.");
subscriptions.needReassignment();
Expand Down
4 changes: 3 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ public enum Errors {
new ApiException("Some of the committing partitions are not assigned the committer")),
INVALID_COMMIT_OFFSET_SIZE(28,
new ApiException("The committing offset data size is not valid")),
AUTHORIZATION_FAILED(29, new ApiException("Request is not authorized."));
AUTHORIZATION_FAILED(29, new ApiException("Request is not authorized.")),
REBALANCE_IN_PROGRESS(30,
new ApiException("The group is rebalancing, so a rejoin is needed."));

private static final Logger log = LoggerFactory.getLogger(Errors.class);

Expand Down
4 changes: 3 additions & 1 deletion core/src/main/scala/kafka/coordinator/ConsumerCoordinator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,10 @@ class ConsumerCoordinator(val brokerId: Int,
responseCallback(Errors.UNKNOWN_CONSUMER_ID.code)
} else if (!group.has(consumerId)) {
responseCallback(Errors.UNKNOWN_CONSUMER_ID.code)
} else if (generationId != group.generationId || !group.is(Stable)) {
} else if (generationId != group.generationId) {
responseCallback(Errors.ILLEGAL_GENERATION.code)
} else if (!group.is(Stable)) {
responseCallback(Errors.REBALANCE_IN_PROGRESS.code)
} else {
val consumer = group.get(consumerId)
completeAndScheduleNextHeartbeatExpiration(group, consumer)
Expand Down
6 changes: 3 additions & 3 deletions core/src/test/scala/unit/kafka/coordinator/ConsumerCoordinatorResponseTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class ConsumerCoordinatorResponseTest extends JUnitSuite {
}

@Test
def testHeartbeatDuringRebalanceCausesIllegalGeneration() {
def testHeartbeatDuringRebalanceCausesRebalanceInProgress() {
val groupId = "groupId"
val partitionAssignmentStrategy = "range"

Expand All @@ -249,10 +249,10 @@ class ConsumerCoordinatorResponseTest extends JUnitSuite {
sendJoinGroup(groupId, JoinGroupRequest.UNKNOWN_CONSUMER_ID, partitionAssignmentStrategy,
DefaultSessionTimeout, isCoordinatorForGroup = true)

// We should be in the middle of a rebalance, so the heartbeat should return illegal generation
// We should be in the middle of a rebalance, so the heartbeat should return rebalance in progress
EasyMock.reset(offsetManager)
val heartbeatResult = heartbeat(groupId, assignedConsumerId, initialGenerationId, isCoordinatorForGroup = true)
assertEquals(Errors.ILLEGAL_GENERATION.code, heartbeatResult)
assertEquals(Errors.REBALANCE_IN_PROGRESS.code, heartbeatResult)
}

@Test
Expand Down