From c1e49cc70df6a85b6ea7a9bdc47328cb26477ee3 Mon Sep 17 00:00:00 2001 From: Demogorgon314 Date: Wed, 9 Feb 2022 17:07:26 +0800 Subject: [PATCH 1/3] Change broker producer fence log level --- .../org/apache/pulsar/broker/service/ServerCnx.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java index ef09a80e62329..fae7f3a77f672 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java @@ -1399,8 +1399,15 @@ private void buildProducerAndAddTopic(Topic topic, long producerId, String produ producers.remove(producerId, producerFuture); }).exceptionally(ex -> { - log.error("[{}] Failed to add producer to topic {}: producerId={}, {}", - remoteAddress, topicName, producerId, ex.getMessage()); + if (ex.getCause() instanceof BrokerServiceException.ProducerFencedException) { + if (log.isDebugEnabled()) { + log.debug("[{}] Failed to add producer to topic {}: producerId={}, {}", + remoteAddress, topicName, producerId, ex.getMessage()); + } + } else { + log.warn("[{}] Failed to add producer to topic {}: producerId={}, {}", + remoteAddress, topicName, producerId, ex.getMessage()); + } producer.closeNow(true); if (producerFuture.completeExceptionally(ex)) { From a7ac67eb941f20f08b53e90f777d53349e63b178 Mon Sep 17 00:00:00 2001 From: Kai Wang Date: Mon, 14 Feb 2022 10:07:55 +0800 Subject: [PATCH 2/3] Fix reviewer comment Co-authored-by: lipenghui --- .../main/java/org/apache/pulsar/broker/service/ServerCnx.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java index fae7f3a77f672..2ccda695d5f26 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java @@ -1402,7 +1402,7 @@ private void buildProducerAndAddTopic(Topic topic, long producerId, String produ if (ex.getCause() instanceof BrokerServiceException.ProducerFencedException) { if (log.isDebugEnabled()) { log.debug("[{}] Failed to add producer to topic {}: producerId={}, {}", - remoteAddress, topicName, producerId, ex.getMessage()); + remoteAddress, topicName, producerId, ex.getCause().getMessage()); } } else { log.warn("[{}] Failed to add producer to topic {}: producerId={}, {}", From 22e000d79f759e44382a6ef14b31c3143e5d2d89 Mon Sep 17 00:00:00 2001 From: Demogorgon314 Date: Tue, 15 Feb 2022 14:54:15 +0800 Subject: [PATCH 3/3] Resolve reviewer comment --- .../main/java/org/apache/pulsar/broker/service/ServerCnx.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java index 2ccda695d5f26..a041a138f97d0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java @@ -1406,7 +1406,7 @@ private void buildProducerAndAddTopic(Topic topic, long producerId, String produ } } else { log.warn("[{}] Failed to add producer to topic {}: producerId={}, {}", - remoteAddress, topicName, producerId, ex.getMessage()); + remoteAddress, topicName, producerId, ex.getCause().getMessage()); } producer.closeNow(true);