You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by da...@apache.org on 2024/01/11 08:28:40 UTC
(kafka) branch trunk updated: MINOR: fix custom retry backoff in new group coordinator (#15170)
This is an automated email from the ASF dual-hosted git repository.
dajac pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new cd3b3d9804f MINOR: fix custom retry backoff in new group coordinator (#15170)
cd3b3d9804f is described below
commit cd3b3d9804f3b5193870ada2aeea00045acc2c30
Author: Jeff Kim <ki...@gmail.com>
AuthorDate: Thu Jan 11 03:28:32 2024 -0500
MINOR: fix custom retry backoff in new group coordinator (#15170)
When a retryable write operation fails, we retry with the default 500ms backoff. If a custom retry backoff was used to originally schedule the operation, we should retry with the same custom backoff instead of the default.
Reviewers: David Jacot <dj...@confluent.io>
---
.../group/runtime/CoordinatorRuntime.java | 2 +-
.../group/runtime/CoordinatorRuntimeTest.java | 73 ++++++++++++++++++++++
2 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java
index fffdd83b256..8a3c3b1a8c5 100644
--- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java
+++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java
@@ -343,7 +343,7 @@ public class CoordinatorRuntime<S extends CoordinatorShard<U>, U> implements Aut
if (retry) {
log.info("The write event {} for the timer {} failed due to {}. Rescheduling it. ",
event.name, key, ex.getMessage());
- schedule(key, retryBackoff, TimeUnit.MILLISECONDS, retry, operation);
+ schedule(key, retryBackoff, TimeUnit.MILLISECONDS, true, retryBackoff, operation);
} else {
log.error("The write event {} for the timer {} failed due to {}. Ignoring it. ",
event.name, key, ex.getMessage());
diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntimeTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntimeTest.java
index e0d4dd08cdf..34ef9240b6b 100644
--- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntimeTest.java
+++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntimeTest.java
@@ -1986,6 +1986,79 @@ public class CoordinatorRuntimeTest {
assertEquals(0, ctx.timer.size());
}
+ @Test
+ public void testRetryableTimerWithCustomBackoff() throws InterruptedException {
+ MockTimer timer = new MockTimer();
+ CoordinatorRuntime<MockCoordinatorShard, String> runtime =
+ new CoordinatorRuntime.Builder<MockCoordinatorShard, String>()
+ .withTime(timer.time())
+ .withTimer(timer)
+ .withDefaultWriteTimeOut(DEFAULT_WRITE_TIMEOUT)
+ .withLoader(new MockCoordinatorLoader())
+ .withEventProcessor(new DirectEventProcessor())
+ .withPartitionWriter(new MockPartitionWriter())
+ .withCoordinatorShardBuilderSupplier(new MockCoordinatorShardBuilderSupplier())
+ .withCoordinatorRuntimeMetrics(mock(GroupCoordinatorRuntimeMetrics.class))
+ .withCoordinatorMetrics(mock(GroupCoordinatorMetrics.class))
+ .build();
+
+ // Loads the coordinator.
+ runtime.scheduleLoadOperation(TP, 10);
+
+ // Check initial state.
+ CoordinatorRuntime<MockCoordinatorShard, String>.CoordinatorContext ctx = runtime.contextOrThrow(TP);
+ assertEquals(0, ctx.timer.size());
+
+ // Timer #1.
+ AtomicInteger cnt = new AtomicInteger(0);
+ ctx.timer.schedule("timer-1", 10, TimeUnit.MILLISECONDS, true, 1000, () -> {
+ cnt.incrementAndGet();
+ throw new KafkaException("error");
+ });
+
+ // The coordinator timer should have one pending task.
+ assertEquals(1, ctx.timer.size());
+
+ // Advance time to fire the pending timer.
+ timer.advanceClock(10 + 1);
+
+ // The timer should have been called and the timer should have one pending task.
+ assertEquals(1, cnt.get());
+ assertEquals(1, ctx.timer.size());
+
+ // Advance past the default retry backoff.
+ timer.advanceClock(500 + 1);
+
+ // The timer should not have been called yet.
+ assertEquals(1, cnt.get());
+ assertEquals(1, ctx.timer.size());
+
+ // Advance past the custom retry.
+ timer.advanceClock(500 + 1);
+
+ // The timer should have been called and the timer should have one pending task.
+ assertEquals(2, cnt.get());
+ assertEquals(1, ctx.timer.size());
+
+ // Advance past the default retry backoff.
+ timer.advanceClock(500 + 1);
+
+ // The timer should not have been called yet.
+ assertEquals(2, cnt.get());
+ assertEquals(1, ctx.timer.size());
+
+ // Advance past the custom retry.
+ timer.advanceClock(500 + 1);
+
+ // The timer should have been called and the timer should have one pending task.
+ assertEquals(3, cnt.get());
+ assertEquals(1, ctx.timer.size());
+
+ // Cancel Timer #1.
+ ctx.timer.cancel("timer-1");
+ assertEquals(0, ctx.timer.size());
+ }
+
@Test
public void testNonRetryableTimer() throws InterruptedException {
MockTimer timer = new MockTimer();