[pulsar] branch master updated: Topic loading in rest-api should time out in zooKeeperOperationTimeoutSeconds (#4805)

[sijie]

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

sijie 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 abe27e6  Topic loading in rest-api should time out in 
zooKeeperOperationTimeoutSeconds (#4805)
abe27e6 is described below

commit abe27e638ffa4976d6746b278bf987f810ed711a
Author: massakam <massa...@yahoo-corp.jp>
AuthorDate: Fri Jul 26 13:25:06 2019 +0900

    Topic loading in rest-api should time out in 
zooKeeperOperationTimeoutSeconds (#4805)
---
 .../java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index 2d335e5..9150f99 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -1617,7 +1617,7 @@ public class PersistentTopicsBase extends AdminResource {
     private Topic getTopicReference(TopicName topicName) {
         try {
             return 
pulsar().getBrokerService().getTopicIfExists(topicName.toString())
-                    
.get(pulsar().getConfiguration().getZooKeeperSessionTimeoutMillis(), 
TimeUnit.MILLISECONDS)
+                    
.get(pulsar().getConfiguration().getZooKeeperOperationTimeoutSeconds(), 
TimeUnit.SECONDS)
                     .orElseThrow(() -> topicNotFoundReason(topicName));
         } catch (RestException e) {
             throw e;