You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/06/15 00:03:14 UTC
[pulsar] branch master updated: [pulsar-broker] disable publish
timeout by default (#4434)
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 0fd988d [pulsar-broker] disable publish timeout by default (#4434)
0fd988d is described below
commit 0fd988d32f64ba7a8fde5f74ba18056af35d302c
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Fri Jun 14 17:03:07 2019 -0700
[pulsar-broker] disable publish timeout by default (#4434)
* [pulsar-broker] disable publish timeout by default
* fix scheduling
---
conf/broker.conf | 4 ++--
conf/standalone.conf | 4 ++--
.../java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java | 3 +++
.../src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/conf/broker.conf b/conf/broker.conf
index d231c77..05866f8 100644
--- a/conf/broker.conf
+++ b/conf/broker.conf
@@ -541,10 +541,10 @@ autoSkipNonRecoverableData=false
managedLedgerMetadataOperationsTimeoutSeconds=60
# Read entries timeout when broker tries to read messages from bookkeeper.
-managedLedgerReadEntryTimeoutSeconds=120
+managedLedgerReadEntryTimeoutSeconds=0
# Add entry timeout when broker tries to publish message to bookkeeper (0 to disable it).
-managedLedgerAddEntryTimeoutSeconds=120
+managedLedgerAddEntryTimeoutSeconds=0
### --- Load balancer --- ###
diff --git a/conf/standalone.conf b/conf/standalone.conf
index 46a6d77..4d79af5 100644
--- a/conf/standalone.conf
+++ b/conf/standalone.conf
@@ -366,10 +366,10 @@ autoSkipNonRecoverableData=false
managedLedgerMetadataOperationsTimeoutSeconds=60
# Read entries timeout when broker tries to read messages from bookkeeper.
-managedLedgerReadEntryTimeoutSeconds=120
+managedLedgerReadEntryTimeoutSeconds=0
# Add entry timeout when broker tries to publish message to bookkeeper (0 to disable it).
-managedLedgerAddEntryTimeoutSeconds=120
+managedLedgerAddEntryTimeoutSeconds=0
# Use Open Range-Set to cache unacked messages
managedLedgerUnackedRangesOpenCacheSetEnabled=true
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 3bfe7ab..bdb062f 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
@@ -3074,6 +3074,9 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback {
// disable timeout task checker if timeout <= 0
if (config.getAddEntryTimeoutSeconds() > 0 || config.getReadEntryTimeoutSeconds() > 0) {
long timeoutSec = Math.min(config.getAddEntryTimeoutSeconds(), config.getReadEntryTimeoutSeconds());
+ timeoutSec = timeoutSec <= 0
+ ? Math.max(config.getAddEntryTimeoutSeconds(), config.getReadEntryTimeoutSeconds())
+ : timeoutSec;
this.timeoutTask = this.scheduledExecutor.scheduleAtFixedRate(safeRun(() -> {
checkAddTimeout();
checkReadTimeout();
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index 5dfd2e8..7b15ab1 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -926,11 +926,11 @@ public class ServiceConfiguration implements PulsarConfiguration {
doc = "Read entries timeout when broker tries to read messages from bookkeeper "
+ "(0 to disable it)"
)
- private long managedLedgerReadEntryTimeoutSeconds = 120;
+ private long managedLedgerReadEntryTimeoutSeconds = 0;
@FieldContext(category = CATEGORY_STORAGE_ML,
doc = "Add entry timeout when broker tries to publish message to bookkeeper.(0 to disable it)")
- private long managedLedgerAddEntryTimeoutSeconds = 120;
+ private long managedLedgerAddEntryTimeoutSeconds = 0;
/*** --- Load balancer --- ****/
@FieldContext(