This is an automated email from the ASF dual-hosted git repository. mmerli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push: new c60e063fcab Reduced level of redundant logs (#16345) c60e063fcab is described below commit c60e063fcab18a2da9757ca5f13479e268e0681d Author: Matteo Merli <mme...@apache.org> AuthorDate: Sun Jul 3 12:32:13 2022 -0700 Reduced level of redundant logs (#16345) --- .../org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java | 3 +-- .../org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java | 6 ++++-- .../java/org/apache/pulsar/broker/service/AbstractTopic.java | 4 +++- .../main/java/org/apache/pulsar/broker/service/ServerCnx.java | 11 +++++++---- .../pulsar/broker/service/persistent/PersistentTopic.java | 8 ++++++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java index c6b9ded9755..867ef683691 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java @@ -3746,8 +3746,7 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback { } } createdLedgerCustomMetadata = finalMetadata; - log.info("[{}] Creating ledger, metadata: {} - metadata ops timeout : {} seconds", - name, finalMetadata, config.getMetadataOperationsTimeoutSeconds()); + try { bookKeeper.asyncCreateLedger(config.getEnsembleSize(), config.getWriteQuorumSize(), config.getAckQuorumSize(), digestType, config.getPassword(), cb, ledgerCreated, finalMetadata); diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java index 3359b78679e..3d1e565ac34 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java @@ -214,8 +214,10 @@ public class MetaStoreImpl implements MetaStore { @Override public void asyncUpdateCursorInfo(String ledgerName, String cursorName, ManagedCursorInfo info, Stat stat, MetaStoreCallback<Void> callback) { - log.info("[{}] [{}] Updating cursor info ledgerId={} mark-delete={}:{}", ledgerName, cursorName, - info.getCursorsLedgerId(), info.getMarkDeleteLedgerId(), info.getMarkDeleteEntryId()); + if (log.isDebugEnabled()) { + log.debug("[{}] [{}] Updating cursor info ledgerId={} mark-delete={}:{}", ledgerName, cursorName, + info.getCursorsLedgerId(), info.getMarkDeleteLedgerId(), info.getMarkDeleteEntryId()); + } String path = PREFIX + ledgerName + "/" + cursorName; byte[] content = compressCursorInfo(info); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java index acf68bd2ae8..59d9d875fd2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java @@ -1227,7 +1227,9 @@ public abstract class AbstractTopic implements Topic, TopicPolicyListener<TopicP this.topicPublishRateLimiter.update(publishRate); } } else { - log.info("Disabling publish throttling for {}", this.topic); + if (log.isDebugEnabled()) { + log.debug("Disabling publish throttling for {}", this.topic); + } if (topicPublishRateLimiter != null) { topicPublishRateLimiter.close(); } 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 87b6c4208ae..c394f71357b 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 @@ -1266,8 +1266,10 @@ public class ServerCnx extends PulsarHandler implements TransportCnx { } } - log.info("[{}][{}] Creating producer. producerId={}, schema is {}", remoteAddress, topicName, producerId, - schema == null ? "absent" : "present"); + if (log.isDebugEnabled()) { + log.debug("[{}][{}] Creating producer. producerId={}, schema is {}", remoteAddress, topicName, + producerId, schema == null ? "absent" : "present"); + } service.getOrCreateTopic(topicName.toString()).thenCompose((Topic topic) -> { // Before creating producer, check if backlog quota exceeded @@ -2481,8 +2483,9 @@ public class ServerCnx extends PulsarHandler implements TransportCnx { return topic.addSchema(schema); } else { return topic.hasSchema().thenCompose((hasSchema) -> { - log.info("[{}] {} configured with schema {}", - remoteAddress, topic.getName(), hasSchema); + if (log.isDebugEnabled()) { + log.debug("[{}] {} configured with schema {}", remoteAddress, topic.getName(), hasSchema); + } CompletableFuture<SchemaVersion> result = new CompletableFuture<>(); if (hasSchema && (schemaValidationEnforced || topic.getSchemaValidationEnforced())) { result.completeExceptionally(new IncompatibleSchemaException( diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java index 9e8604dd28b..61ff46e5b6d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java @@ -801,7 +801,9 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal new BrokerServiceException("Connection was closed while the opening the cursor ")); } else { checkReplicatedSubscriptionControllerState(); - log.info("[{}][{}] Created new subscription for {}", topic, subscriptionName, consumerId); + if (log.isDebugEnabled()) { + log.debug("[{}][{}] Created new subscription for {}", topic, subscriptionName, consumerId); + } return CompletableFuture.completedFuture(consumer); } }); @@ -2813,7 +2815,9 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal }); if (!shouldBeEnabled.get()) { - log.info("[{}] There are no replicated subscriptions on the topic", topic); + if (log.isDebugEnabled()) { + log.debug("[{}] There are no replicated subscriptions on the topic", topic); + } } checkReplicatedSubscriptionControllerState(shouldBeEnabled.get());