From 54ed3f64374064ad746da92ff89a58575f818d69 Mon Sep 17 00:00:00 2001
From: Philip Nee <pnee@confluent.io>
Date: Wed, 19 Apr 2023 21:29:35 -0700
Subject: [PATCH 1/3] MINOR: Fixing typos

---
 .../clients/consumer/internals/ConsumerCoordinator.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
index 1f6c5ef0d75cc..000e21b8f2335 100644
--- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
+++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
@@ -759,7 +759,7 @@ private void validateCooperativeAssignment(final Map<String, List<TopicPartition
     protected boolean onJoinPrepare(Timer timer, int generation, String memberId) {
         log.debug("Executing onJoinPrepare with generation {} and memberId {}", generation, memberId);
         if (joinPrepareTimer == null) {
-            // We should complete onJoinPrepare before rebalanceTimeout,
+            // We should complete onJoinPrepare before rebalanceTimeoutMs,
             // and continue to join group to avoid member got kicked out from group
             joinPrepareTimer = time.timer(rebalanceConfig.rebalanceTimeoutMs);
         } else {
@@ -782,10 +782,10 @@ protected boolean onJoinPrepare(Timer timer, int generation, String memberId) {
 
             // Keep retrying/waiting the offset commit when:
             // 1. offset commit haven't done (and joinPrepareTimer not expired)
-            // 2. failed with retryable exception (and joinPrepareTimer not expired)
+            // 2. failed with retriable exception (and joinPrepareTimer not expired)
             // Otherwise, continue to revoke partitions, ex:
             // 1. if joinPrepareTime has expired
-            // 2. if offset commit failed with no-retryable exception
+            // 2. if offset commit failed with non-retriable exception
             // 3. if offset commit success
             boolean onJoinPrepareAsyncCommitCompleted = true;
             if (joinPrepareTimer.isExpired()) {
@@ -841,7 +841,7 @@ protected boolean onJoinPrepare(Timer timer, int generation, String memberId) {
                     break;
 
                 case COOPERATIVE:
-                    // only revoke those partitions that are not in the subscription any more.
+                    // only revoke those partitions that are not in the subscription anymore.
                     Set<TopicPartition> ownedPartitions = new HashSet<>(subscriptions.assignedPartitions());
                     revokedPartitions.addAll(ownedPartitions.stream()
                         .filter(tp -> !subscriptions.subscription().contains(tp.topic()))

From 9a30c25dfa590bf09f266be33d2fccb9d3ca9726 Mon Sep 17 00:00:00 2001
From: Philip Nee <pnee@confluent.io>
Date: Wed, 19 Apr 2023 21:32:52 -0700
Subject: [PATCH 2/3] Update ConsumerCoordinator.java

---
 .../kafka/clients/consumer/internals/ConsumerCoordinator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
index 000e21b8f2335..70844c46f0546 100644
--- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
+++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
@@ -784,7 +784,7 @@ protected boolean onJoinPrepare(Timer timer, int generation, String memberId) {
             // 1. offset commit haven't done (and joinPrepareTimer not expired)
             // 2. failed with retriable exception (and joinPrepareTimer not expired)
             // Otherwise, continue to revoke partitions, ex:
-            // 1. if joinPrepareTime has expired
+            // 1. if joinPrepareTimer has expired
             // 2. if offset commit failed with non-retriable exception
             // 3. if offset commit success
             boolean onJoinPrepareAsyncCommitCompleted = true;

From 74832ac3d005c6283ed53a9efd1e84c477ae354b Mon Sep 17 00:00:00 2001
From: Philip Nee <pnee@confluent.io>
Date: Wed, 19 Apr 2023 21:37:10 -0700
Subject: [PATCH 3/3] Update ConsumerCoordinator.java

---
 .../kafka/clients/consumer/internals/ConsumerCoordinator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
index 70844c46f0546..76b37d380e46a 100644
--- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
+++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java
@@ -284,7 +284,7 @@ private void maybeUpdateJoinedSubscription(Set<TopicPartition> assignedPartition
             // into the subscriptions as long as they still match the subscribed pattern
 
             Set<String> addedTopics = new HashSet<>();
-            // this is a copy because its handed to listener below
+            // this is a copy because it's handed to listener below
             for (TopicPartition tp : assignedPartitions) {
                 if (!joinedSubscription.contains(tp.topic()))
                     addedTopics.add(tp.topic());