You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2020/11/21 02:02:54 UTC

[pulsar] branch branch-2.6 updated: [Branch-2.6] Fix cherry-pick issue between #8302 and #8304 (#8652)

This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new 45125a1  [Branch-2.6] Fix cherry-pick issue between #8302 and #8304 (#8652)
45125a1 is described below

commit 45125a17e5f77a10bb8dcc2c2749df4114747cf4
Author: lipenghui <pe...@apache.org>
AuthorDate: Sat Nov 21 10:02:37 2020 +0800

    [Branch-2.6] Fix cherry-pick issue between #8302 and #8304 (#8652)
---
 .../src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java
index 34b55a6..7f9b8d1 100644
--- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java
+++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java
@@ -113,12 +113,12 @@ public abstract class ZooKeeperCache implements Watcher {
 
         this.childrenCache = Caffeine.newBuilder()
                 .recordStats()
-                .expireAfterWrite(zkOperationTimeoutSeconds, TimeUnit.SECONDS)
+                .expireAfterWrite(cacheExpirySeconds, TimeUnit.SECONDS)
                 .buildAsync((key, executor1) -> null);
 
         this.existsCache = Caffeine.newBuilder()
                 .recordStats()
-                .expireAfterWrite(zkOperationTimeoutSeconds, TimeUnit.SECONDS)
+                .expireAfterWrite(cacheExpirySeconds, TimeUnit.SECONDS)
                 .buildAsync((key, executor1) -> null);
 
         CacheMetricsCollector.CAFFEINE.addCache(cacheName + "-data", dataCache);