From 2b5bb18353899e042505fa4e20b3f1242a646815 Mon Sep 17 00:00:00 2001 From: massakam Date: Fri, 26 Jul 2019 13:25:06 +0900 Subject: [PATCH] Topic loading in rest-api should time out in zooKeeperOperationTimeoutSeconds (#4805) (cherry picked from commit abe27e638ffa4976d6746b278bf987f810ed711a) --- .../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 8c51b0379b6..4c06610dbb4 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 @@ -1343,7 +1343,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; -- GitLab