From cb0449dcabb877bcbda0099e8a8b86eb62f9807f Mon Sep 17 00:00:00 2001 From: Gwen Shapira Date: Tue, 6 Jan 2015 16:19:29 -0800 Subject: [PATCH] removed broker code for handling acks>1 and made NotEnoughReplicasAfterAppendException non-retriable --- .../kafka/common/errors/NotEnoughReplicasAfterAppendException.java | 2 +- core/src/main/scala/kafka/cluster/Partition.scala | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/common/errors/NotEnoughReplicasAfterAppendException.java b/clients/src/main/java/org/apache/kafka/common/errors/NotEnoughReplicasAfterAppendException.java index 75c80a9..23d53f9 100644 --- a/clients/src/main/java/org/apache/kafka/common/errors/NotEnoughReplicasAfterAppendException.java +++ b/clients/src/main/java/org/apache/kafka/common/errors/NotEnoughReplicasAfterAppendException.java @@ -21,7 +21,7 @@ package org.apache.kafka.common.errors; * This exception is raised when the low ISR size is discovered *after* the message * was already appended to the log. Producer retries will cause duplicates. */ -public class NotEnoughReplicasAfterAppendException extends RetriableException { +public class NotEnoughReplicasAfterAppendException extends ApiException { private static final long serialVersionUID = 1L; public NotEnoughReplicasAfterAppendException() { diff --git a/core/src/main/scala/kafka/cluster/Partition.scala b/core/src/main/scala/kafka/cluster/Partition.scala index b230e9a..5a669bf 100644 --- a/core/src/main/scala/kafka/cluster/Partition.scala +++ b/core/src/main/scala/kafka/cluster/Partition.scala @@ -317,8 +317,6 @@ class Partition(val topic: String, } else { (true, ErrorMapping.NotEnoughReplicasAfterAppendCode) } - } else if (requiredAcks > 0 && numAcks >= requiredAcks) { - (true, ErrorMapping.NoError) } else (false, ErrorMapping.NoError) case None => -- 1.9.3 (Apple Git-50)