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/03/30 02:19:14 UTC
[pulsar] branch master updated: Fix typo: zookkeeper ==> zookeeper
(#6635)
This is an automated email from the ASF dual-hosted git repository.
penghui 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 8eafd7c Fix typo: zookkeeper ==> zookeeper (#6635)
8eafd7c is described below
commit 8eafd7c71113d3dfc657ac9d71101af243166494
Author: Jia Zhai <zh...@apache.org>
AuthorDate: Mon Mar 30 10:19:06 2020 +0800
Fix typo: zookkeeper ==> zookeeper (#6635)
* typo zookkeeper ==> zookeeper
* fix not match log
---
.../broker/admin/AdminApiGetLastMessageIdTest.java | 4 +-
.../apache/pulsar/broker/admin/AdminApiTest.java | 4 +-
.../org/apache/pulsar/broker/admin/AdminTest.java | 56 +++++++++++-----------
.../apache/pulsar/broker/admin/NamespacesTest.java | 38 +++++++--------
.../pulsar/broker/admin/PersistentTopicsTest.java | 8 ++--
.../pulsar/broker/admin/v1/V1_AdminApiTest.java | 4 +-
.../broker/auth/MockedPulsarServiceBaseTest.java | 12 ++---
.../service/BrokerServiceThrottlingTest.java | 8 ++--
.../ZooKeeperSessionExpireRecoveryTest.java | 2 +-
.../api/AuthenticatedProducerConsumerTest.java | 2 +-
.../client/impl/BrokerClientIntegrationTest.java | 2 +-
.../service/web/DiscoveryServiceWebTest.java | 2 +-
.../discovery/service/BrokerDiscoveryProvider.java | 2 +-
.../pulsar/discovery/service/DiscoveryService.java | 4 +-
.../discovery/service/BaseDiscoveryTestSetup.java | 8 ++--
.../discovery/service/DiscoveryServiceTest.java | 6 +--
.../discovery/service/web/BaseZKStarterTest.java | 6 +--
.../service/web/DiscoveryServiceWebTest.java | 12 ++---
.../service/web/ZookeeperCacheLoaderTest.java | 2 +-
.../proxy/server/BrokerDiscoveryProvider.java | 2 +-
site2/docs/io-debug.md | 4 +-
site2/website/release-notes.md | 2 +-
22 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiGetLastMessageIdTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiGetLastMessageIdTest.java
index 6514201..d00a47b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiGetLastMessageIdTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiGetLastMessageIdTest.java
@@ -78,8 +78,8 @@ public class AdminApiGetLastMessageIdTest extends MockedPulsarServiceBaseTest {
persistentTopics.setServletContext(new MockServletContext());
persistentTopics.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(persistentTopics).globalZk();
- doReturn(mockZookKeeper).when(persistentTopics).localZk();
+ doReturn(mockZooKeeper).when(persistentTopics).globalZk();
+ doReturn(mockZooKeeper).when(persistentTopics).localZk();
doReturn(pulsar.getConfigurationCache().propertiesCache()).when(persistentTopics).tenantsCache();
doReturn(pulsar.getConfigurationCache().policiesCache()).when(persistentTopics).policiesCache();
doReturn(false).when(persistentTopics).isRequestHttps();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
index 4b9d058..3de8840 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
@@ -519,14 +519,14 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
final int newValue = 10;
stopBroker();
// set invalid data into dynamic-config znode so, broker startup fail to deserialize data
- mockZookKeeper.setData(BrokerService.BROKER_SERVICE_CONFIGURATION_PATH, "$".getBytes(), -1);
+ mockZooKeeper.setData(BrokerService.BROKER_SERVICE_CONFIGURATION_PATH, "$".getBytes(), -1);
// start broker: it should have set watch even if with failure of deserialization
startBroker();
Assert.assertNotEquals(pulsar.getConfiguration().getBrokerShutdownTimeoutMs(), newValue);
// update zk with config-value which should fire watch and broker should update the config value
Map<String, String> configMap = Maps.newHashMap();
configMap.put("brokerShutdownTimeoutMs", Integer.toString(newValue));
- mockZookKeeper.setData(BrokerService.BROKER_SERVICE_CONFIGURATION_PATH,
+ mockZooKeeper.setData(BrokerService.BROKER_SERVICE_CONFIGURATION_PATH,
ObjectMapperFactory.getThreadLocal().writeValueAsBytes(configMap), -1);
// wait config to be updated
for (int i = 0; i < 5; i++) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
index 3cae752..5b397ec 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
@@ -125,7 +125,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
clusters = spy(new Clusters());
clusters.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(clusters).globalZk();
+ doReturn(mockZooKeeper).when(clusters).globalZk();
doReturn(configurationCache.clustersCache()).when(clusters).clustersCache();
doReturn(configurationCache.clustersListCache()).when(clusters).clustersListCache();
doReturn(configurationCache.namespaceIsolationPoliciesCache()).when(clusters).namespaceIsolationPoliciesCache();
@@ -135,7 +135,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
properties = spy(new Properties());
properties.setServletContext(new MockServletContext());
properties.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(properties).globalZk();
+ doReturn(mockZooKeeper).when(properties).globalZk();
doReturn(configurationCache.propertiesCache()).when(properties).tenantsCache();
doReturn("test").when(properties).clientAppId();
doNothing().when(properties).validateSuperUserAccess();
@@ -143,8 +143,8 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
namespaces = spy(new Namespaces());
namespaces.setServletContext(new MockServletContext());
namespaces.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(namespaces).globalZk();
- doReturn(mockZookKeeper).when(namespaces).localZk();
+ doReturn(mockZooKeeper).when(namespaces).globalZk();
+ doReturn(mockZooKeeper).when(namespaces).localZk();
doReturn(configurationCache.propertiesCache()).when(namespaces).tenantsCache();
doReturn(configurationCache.policiesCache()).when(namespaces).policiesCache();
doReturn("test").when(namespaces).clientAppId();
@@ -156,8 +156,8 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
brokers = spy(new Brokers());
brokers.setServletContext(new MockServletContext());
brokers.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(brokers).globalZk();
- doReturn(mockZookKeeper).when(brokers).localZk();
+ doReturn(mockZooKeeper).when(brokers).globalZk();
+ doReturn(mockZooKeeper).when(brokers).localZk();
doReturn(configurationCache.clustersListCache()).when(brokers).clustersListCache();
doReturn("test").when(brokers).clientAppId();
doNothing().when(brokers).validateSuperUserAccess();
@@ -168,8 +168,8 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
persistentTopics = spy(new PersistentTopics());
persistentTopics.setServletContext(new MockServletContext());
persistentTopics.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(persistentTopics).globalZk();
- doReturn(mockZookKeeper).when(persistentTopics).localZk();
+ doReturn(mockZooKeeper).when(persistentTopics).globalZk();
+ doReturn(mockZooKeeper).when(persistentTopics).localZk();
doReturn(configurationCache.propertiesCache()).when(persistentTopics).tenantsCache();
doReturn(configurationCache.policiesCache()).when(persistentTopics).policiesCache();
doReturn("test").when(persistentTopics).clientAppId();
@@ -182,16 +182,16 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
resourceQuotas = spy(new ResourceQuotas());
resourceQuotas.setServletContext(new MockServletContext());
resourceQuotas.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(resourceQuotas).globalZk();
- doReturn(mockZookKeeper).when(resourceQuotas).localZk();
+ doReturn(mockZooKeeper).when(resourceQuotas).globalZk();
+ doReturn(mockZooKeeper).when(resourceQuotas).localZk();
doReturn(configurationCache.propertiesCache()).when(resourceQuotas).tenantsCache();
doReturn(configurationCache.policiesCache()).when(resourceQuotas).policiesCache();
brokerStats = spy(new BrokerStats());
brokerStats.setServletContext(new MockServletContext());
brokerStats.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(brokerStats).globalZk();
- doReturn(mockZookKeeper).when(brokerStats).localZk();
+ doReturn(mockZooKeeper).when(brokerStats).globalZk();
+ doReturn(mockZooKeeper).when(brokerStats).localZk();
doReturn(configurationCache.propertiesCache()).when(brokerStats).tenantsCache();
doReturn(configurationCache.policiesCache()).when(brokerStats).policiesCache();
@@ -203,8 +203,8 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
schemasResource = spy(new SchemasResource(mockClock));
schemasResource.setServletContext(new MockServletContext());
schemasResource.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(schemasResource).globalZk();
- doReturn(mockZookKeeper).when(schemasResource).localZk();
+ doReturn(mockZooKeeper).when(schemasResource).globalZk();
+ doReturn(mockZooKeeper).when(schemasResource).localZk();
doReturn(configurationCache.propertiesCache()).when(schemasResource).tenantsCache();
doReturn(configurationCache.policiesCache()).when(schemasResource).policiesCache();
}
@@ -318,7 +318,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
}
// Test zk failures
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
configurationCache.clustersListCache().clear();
try {
clusters.getClusters();
@@ -327,7 +327,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
clusters.createCluster("test", new ClusterData("http://broker.messaging.test.example.com"));
fail("should have failed");
@@ -335,7 +335,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
clusters.updateCluster("test", new ClusterData("http://broker.messaging.test.example.com"));
fail("should have failed");
@@ -343,7 +343,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
clusters.getCluster("test");
fail("should have failed");
@@ -351,7 +351,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failAfter(0, Code.SESSIONEXPIRED);
+ mockZooKeeper.failAfter(0, Code.SESSIONEXPIRED);
try {
clusters.deleteCluster("use");
fail("should have failed");
@@ -359,7 +359,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failAfter(1, Code.SESSIONEXPIRED);
+ mockZooKeeper.failAfter(1, Code.SESSIONEXPIRED);
try {
clusters.deleteCluster("use");
fail("should have failed");
@@ -439,7 +439,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
}
// Test zk failures
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
properties.getTenants();
fail("should have failed");
@@ -447,7 +447,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
properties.getTenantAdmin("my-tenant");
fail("should have failed");
@@ -455,7 +455,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
properties.updateTenant("my-tenant", newPropertyAdmin);
fail("should have failed");
@@ -463,7 +463,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
properties.createTenant("test", tenantInfo);
fail("should have failed");
@@ -471,7 +471,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
properties.deleteTenant("my-tenant");
fail("should have failed");
@@ -480,7 +480,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
}
properties.createTenant("error-property", tenantInfo);
- mockZookKeeper.failAfter(2, Code.SESSIONEXPIRED);
+ mockZooKeeper.failAfter(2, Code.SESSIONEXPIRED);
try {
properties.deleteTenant("error-property");
fail("should have failed");
@@ -609,7 +609,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
// create policies
TenantInfo admin = new TenantInfo();
admin.getAllowedClusters().add(cluster);
- mockZookKeeper.create(PulsarWebResource.path(POLICIES, property),
+ mockZooKeeper.create(PulsarWebResource.path(POLICIES, property),
ObjectMapperFactory.getThreadLocal().writeValueAsBytes(admin), Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
@@ -668,7 +668,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
// create policies
TenantInfo admin = new TenantInfo();
admin.getAllowedClusters().add(cluster);
- ZkUtils.createFullPathOptimistic(mockZookKeeper, PulsarWebResource.path(POLICIES, property, cluster, namespace),
+ ZkUtils.createFullPathOptimistic(mockZooKeeper, PulsarWebResource.path(POLICIES, property, cluster, namespace),
ObjectMapperFactory.getThreadLocal().writeValueAsBytes(new Policies()), ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
index e5d535c..f98758c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
@@ -145,8 +145,8 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
namespaces = spy(new Namespaces());
namespaces.setServletContext(new MockServletContext());
namespaces.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(namespaces).globalZk();
- doReturn(mockZookKeeper).when(namespaces).localZk();
+ doReturn(mockZooKeeper).when(namespaces).globalZk();
+ doReturn(mockZooKeeper).when(namespaces).localZk();
doReturn(pulsar.getConfigurationCache().propertiesCache()).when(namespaces).tenantsCache();
doReturn(pulsar.getConfigurationCache().policiesCache()).when(namespaces).policiesCache();
doReturn(false).when(namespaces).isRequestHttps();
@@ -219,7 +219,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.PRECONDITION_FAILED.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
namespaces.createNamespace(this.testTenant, "use", "my-namespace-3", new BundlesData());
fail("should have failed");
@@ -255,7 +255,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
}
// ZK Errors
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
namespaces.getTenantNamespaces(this.testTenant);
fail("should have failed");
@@ -263,7 +263,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
// Ok
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
namespaces.getNamespacesForCluster(this.testTenant, this.testLocalCluster);
fail("should have failed");
@@ -339,7 +339,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
NamespaceName testNs = this.testLocalNamespaces.get(1);
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
namespaces.getPolicies(testNs.getTenant(), testNs.getCluster(), testNs.getLocalName());
fail("should have failed");
@@ -347,7 +347,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
// Ok
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
namespaces.getPermissions(testNs.getTenant(), testNs.getCluster(), testNs.getLocalName());
fail("should have failed");
@@ -355,7 +355,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
// Ok
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
namespaces.grantPermissionOnNamespace(testNs.getTenant(), testNs.getCluster(), testNs.getLocalName(),
"other-role", EnumSet.of(AuthAction.consume));
@@ -364,7 +364,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
// Ok
}
- mockZookKeeper.failNow(Code.BADVERSION);
+ mockZooKeeper.failNow(Code.BADVERSION);
try {
namespaces.grantPermissionOnNamespace(testNs.getTenant(), testNs.getCluster(), testNs.getLocalName(),
"other-role", EnumSet.of(AuthAction.consume));
@@ -373,7 +373,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.CONFLICT.getStatusCode());
}
- mockZookKeeper.failNow(Code.BADVERSION);
+ mockZooKeeper.failNow(Code.BADVERSION);
try {
namespaces.revokePermissionsOnNamespace(testNs.getTenant(), testNs.getCluster(), testNs.getLocalName(),
"other-role");
@@ -382,7 +382,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.CONFLICT.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
try {
namespaces.revokePermissionsOnNamespace(testNs.getTenant(), testNs.getCluster(), testNs.getLocalName(),
"other-role");
@@ -449,7 +449,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
// Sometimes watcher event consumes scheduled exception, so set to always fail to ensure exception is
// thrown for api call.
- mockZookKeeper.setAlwaysFail(Code.SESSIONEXPIRED);
+ mockZooKeeper.setAlwaysFail(Code.SESSIONEXPIRED);
pulsar.getConfigurationCache().policiesCache().invalidate(AdminResource.path(POLICIES, this.testTenant,
"global", this.testGlobalNamespaces.get(0).getLocalName()));
try {
@@ -459,10 +459,10 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
} catch (RestException e) {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
} finally {
- mockZookKeeper.unsetAlwaysFail();
+ mockZooKeeper.unsetAlwaysFail();
}
- mockZookKeeper.failNow(Code.BADVERSION);
+ mockZooKeeper.failNow(Code.BADVERSION);
try {
namespaces.setNamespaceReplicationClusters(this.testTenant, "global",
this.testGlobalNamespaces.get(0).getLocalName(), Lists.newArrayList("use"));
@@ -486,7 +486,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
assertEquals(e.getResponse().getStatus(), Status.NOT_FOUND.getStatusCode());
}
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
pulsar.getConfigurationCache().policiesCache().clear();
// ensure the ZooKeeper read happens, bypassing the cache
@@ -604,7 +604,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
NamespaceName testNs = this.testLocalNamespaces.get(1);
TopicName topicName = TopicName.get(testNs.getPersistentTopicName("my-topic"));
- ZkUtils.createFullPathOptimistic(mockZookKeeper, "/managed-ledgers/" + topicName.getPersistenceNamingEncoding(),
+ ZkUtils.createFullPathOptimistic(mockZooKeeper, "/managed-ledgers/" + topicName.getPersistenceNamingEncoding(),
new byte[0], null, null);
// setup ownership to localhost
@@ -620,9 +620,9 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
assertEquals(errorCaptor.getValue().getResponse().getStatus(), Status.CONFLICT.getStatusCode());
// delete the topic from ZK
- mockZookKeeper.delete("/managed-ledgers/" + topicName.getPersistenceNamingEncoding(), -1);
+ mockZooKeeper.delete("/managed-ledgers/" + topicName.getPersistenceNamingEncoding(), -1);
- ZkUtils.createFullPathOptimistic(mockZookKeeper,
+ ZkUtils.createFullPathOptimistic(mockZooKeeper,
"/admin/partitioned-topics/" + topicName.getPersistenceNamingEncoding(),
new byte[0], null, null);
@@ -633,7 +633,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
verify(response, timeout(5000).times(1)).resume(errorCaptor.capture());
assertEquals(errorCaptor.getValue().getResponse().getStatus(), Status.CONFLICT.getStatusCode());
- mockZookKeeper.delete("/admin/partitioned-topics/" + topicName.getPersistenceNamingEncoding(), -1);
+ mockZooKeeper.delete("/admin/partitioned-topics/" + topicName.getPersistenceNamingEncoding(), -1);
testNs = this.testGlobalNamespaces.get(0);
// setup ownership to localhost
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index b164f2c..634dafa 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -97,8 +97,8 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
persistentTopics = spy(new PersistentTopics());
persistentTopics.setServletContext(new MockServletContext());
persistentTopics.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(persistentTopics).globalZk();
- doReturn(mockZookKeeper).when(persistentTopics).localZk();
+ doReturn(mockZooKeeper).when(persistentTopics).globalZk();
+ doReturn(mockZooKeeper).when(persistentTopics).localZk();
doReturn(pulsar.getConfigurationCache().propertiesCache()).when(persistentTopics).tenantsCache();
doReturn(pulsar.getConfigurationCache().policiesCache()).when(persistentTopics).policiesCache();
doReturn(false).when(persistentTopics).isRequestHttps();
@@ -111,8 +111,8 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
nonPersistentTopic = spy(new NonPersistentTopics());
nonPersistentTopic.setServletContext(new MockServletContext());
nonPersistentTopic.setPulsar(pulsar);
- doReturn(mockZookKeeper).when(nonPersistentTopic).globalZk();
- doReturn(mockZookKeeper).when(nonPersistentTopic).localZk();
+ doReturn(mockZooKeeper).when(nonPersistentTopic).globalZk();
+ doReturn(mockZooKeeper).when(nonPersistentTopic).localZk();
doReturn(pulsar.getConfigurationCache().propertiesCache()).when(nonPersistentTopic).tenantsCache();
doReturn(pulsar.getConfigurationCache().policiesCache()).when(nonPersistentTopic).policiesCache();
doReturn(false).when(nonPersistentTopic).isRequestHttps();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
index 78e3dc1..2ddff57 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
@@ -489,14 +489,14 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
final int newValue = 10;
stopBroker();
// set invalid data into dynamic-config znode so, broker startup fail to deserialize data
- mockZookKeeper.setData(BrokerService.BROKER_SERVICE_CONFIGURATION_PATH, "$".getBytes(), -1);
+ mockZooKeeper.setData(BrokerService.BROKER_SERVICE_CONFIGURATION_PATH, "$".getBytes(), -1);
// start broker: it should have set watch even if with failure of deserialization
startBroker();
Assert.assertNotEquals(pulsar.getConfiguration().getBrokerShutdownTimeoutMs(), newValue);
// update zk with config-value which should fire watch and broker should update the config value
Map<String, String> configMap = Maps.newHashMap();
configMap.put("brokerShutdownTimeoutMs", Integer.toString(newValue));
- mockZookKeeper.setData(BrokerService.BROKER_SERVICE_CONFIGURATION_PATH,
+ mockZooKeeper.setData(BrokerService.BROKER_SERVICE_CONFIGURATION_PATH,
ObjectMapperFactory.getThreadLocal().writeValueAsBytes(configMap), -1);
// wait config to be updated
for (int i = 0; i < 5; i++) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
index 6fe83b8..53e629b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
@@ -79,7 +79,7 @@ public abstract class MockedPulsarServiceBaseTest {
protected URI lookupUrl;
- protected MockZooKeeper mockZookKeeper;
+ protected MockZooKeeper mockZooKeeper;
protected NonClosableMockBookKeeper mockBookKeeper;
protected boolean isTcpLookup = false;
protected final String configClusterName = "test";
@@ -143,8 +143,8 @@ public abstract class MockedPulsarServiceBaseTest {
.setUncaughtExceptionHandler((thread, ex) -> log.info("Uncaught exception", ex))
.build());
- mockZookKeeper = createMockZooKeeper();
- mockBookKeeper = createMockBookKeeper(mockZookKeeper, bkExecutor);
+ mockZooKeeper = createMockZooKeeper();
+ mockBookKeeper = createMockBookKeeper(mockZooKeeper, bkExecutor);
startBroker();
}
@@ -167,8 +167,8 @@ public abstract class MockedPulsarServiceBaseTest {
if (mockBookKeeper != null) {
mockBookKeeper.reallyShutdown();
}
- if (mockZookKeeper != null) {
- mockZookKeeper.shutdown();
+ if (mockZooKeeper != null) {
+ mockZooKeeper.shutdown();
}
if (sameThreadOrderedSafeExecutor != null) {
sameThreadOrderedSafeExecutor.shutdown();
@@ -292,7 +292,7 @@ public abstract class MockedPulsarServiceBaseTest {
public CompletableFuture<ZooKeeper> create(String serverList, SessionType sessionType,
int zkSessionTimeoutMillis) {
// Always return the same instance (so that we don't loose the mock ZK content on broker restart
- return CompletableFuture.completedFuture(mockZookKeeper);
+ return CompletableFuture.completedFuture(mockZooKeeper);
}
};
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
index feb1a14..211b527 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
@@ -251,11 +251,11 @@ public class BrokerServiceThrottlingTest extends BrokerTestBase {
Map<String, String> throttlingMap = Maps.newHashMap();
throttlingMap.put("maxConcurrentLookupRequest", Integer.toString(permits));
byte[] content = ObjectMapperFactory.getThreadLocal().writeValueAsBytes(throttlingMap);
- if (mockZookKeeper.exists(BROKER_SERVICE_CONFIGURATION_PATH, false) != null) {
- mockZookKeeper.setData(BROKER_SERVICE_CONFIGURATION_PATH, content, -1);
+ if (mockZooKeeper.exists(BROKER_SERVICE_CONFIGURATION_PATH, false) != null) {
+ mockZooKeeper.setData(BROKER_SERVICE_CONFIGURATION_PATH, content, -1);
} else {
- ZkUtils.createFullPathOptimistic(mockZookKeeper, BROKER_SERVICE_CONFIGURATION_PATH, content,
+ ZkUtils.createFullPathOptimistic(mockZooKeeper, BROKER_SERVICE_CONFIGURATION_PATH, content,
ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
}
}
-}
\ No newline at end of file
+}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperSessionExpireRecoveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperSessionExpireRecoveryTest.java
index 0ac89e4..7d06180 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperSessionExpireRecoveryTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperSessionExpireRecoveryTest.java
@@ -54,7 +54,7 @@ public class ZooKeeperSessionExpireRecoveryTest extends MockedPulsarServiceBaseT
assertTrue(Sets.newHashSet(admin.clusters().getClusters()).contains("my-cluster"));
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
assertTrue(Sets.newHashSet(admin.clusters().getClusters()).contains("my-cluster"));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java
index 7064653..1336967 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java
@@ -316,7 +316,7 @@ public class AuthenticatedProducerConsumerTest extends ProducerConsumerBase {
String topic = "persistent://" + namespace + "1/topic1";
// this will cause NPE and it should throw 500
- mockZookKeeper.shutdown();
+ mockZooKeeper.shutdown();
pulsar.getConfiguration().setSuperUserRoles(Sets.newHashSet());
try {
admin.topics().getPartitionedTopicMetadata(topic);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
index 15357d3..d266e1d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
@@ -713,7 +713,7 @@ public class BrokerClientIntegrationTest extends ProducerConsumerBase {
configurationMap.put("loadManagerClassName", "org.apache.pulsar.invalid.loadmanager");
byte[] content = ObjectMapperFactory.getThreadLocal().writeValueAsBytes(configurationMap);
dynamicConfigurationCache.invalidate(BROKER_SERVICE_CONFIGURATION_PATH);
- mockZookKeeper.setData(BROKER_SERVICE_CONFIGURATION_PATH, content, -1);
+ mockZooKeeper.setData(BROKER_SERVICE_CONFIGURATION_PATH, content, -1);
}
static class TimestampEntryCount {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
index b53b55f..cc3cb3b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
@@ -81,7 +81,7 @@ public class DiscoveryServiceWebTest extends ProducerConsumerBase {
ServiceConfig config = new ServiceConfig();
config.setWebServicePort(Optional.of(0));
ServerManager server = new ServerManager(config);
- DiscoveryZooKeeperClientFactoryImpl.zk = mockZookKeeper;
+ DiscoveryZooKeeperClientFactoryImpl.zk = mockZooKeeper;
Map<String, String> params = new TreeMap<>();
params.put("zookeeperServers", "");
params.put("zookeeperClientFactoryClass", DiscoveryZooKeeperClientFactoryImpl.class.getName());
diff --git a/pulsar-discovery-service/src/main/java/org/apache/pulsar/discovery/service/BrokerDiscoveryProvider.java b/pulsar-discovery-service/src/main/java/org/apache/pulsar/discovery/service/BrokerDiscoveryProvider.java
index de3fef1..f302a60 100644
--- a/pulsar-discovery-service/src/main/java/org/apache/pulsar/discovery/service/BrokerDiscoveryProvider.java
+++ b/pulsar-discovery-service/src/main/java/org/apache/pulsar/discovery/service/BrokerDiscoveryProvider.java
@@ -77,7 +77,7 @@ public class BrokerDiscoveryProvider implements Closeable {
config.getConfigurationStoreServers(), orderedExecutor, scheduledExecutorScheduler);
globalZkCache.start();
} catch (Exception e) {
- LOG.error("Failed to start Zookkeeper {}", e.getMessage(), e);
+ LOG.error("Failed to start ZooKeeper {}", e.getMessage(), e);
throw new PulsarServerException("Failed to start zookeeper :" + e.getMessage(), e);
}
}
diff --git a/pulsar-discovery-service/src/main/java/org/apache/pulsar/discovery/service/DiscoveryService.java b/pulsar-discovery-service/src/main/java/org/apache/pulsar/discovery/service/DiscoveryService.java
index d017c81..f0ed571 100644
--- a/pulsar-discovery-service/src/main/java/org/apache/pulsar/discovery/service/DiscoveryService.java
+++ b/pulsar-discovery-service/src/main/java/org/apache/pulsar/discovery/service/DiscoveryService.java
@@ -82,7 +82,7 @@ public class DiscoveryService implements Closeable {
}
/**
- * Starts discovery service by initializing zookkeeper and server
+ * Starts discovery service by initializing ZooKeeper and server
*
* @throws Exception
*/
@@ -220,4 +220,4 @@ public class DiscoveryService implements Closeable {
}
private static final Logger LOG = LoggerFactory.getLogger(DiscoveryService.class);
-}
\ No newline at end of file
+}
diff --git a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/BaseDiscoveryTestSetup.java b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/BaseDiscoveryTestSetup.java
index e05701f..3c7b3ff 100644
--- a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/BaseDiscoveryTestSetup.java
+++ b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/BaseDiscoveryTestSetup.java
@@ -41,7 +41,7 @@ public class BaseDiscoveryTestSetup {
protected ServiceConfig config;
protected DiscoveryService service;
- protected MockZooKeeper mockZookKeeper;
+ protected MockZooKeeper mockZooKeeper;
private final String TLS_SERVER_CERT_FILE_PATH = "./src/test/resources/certificate/server.crt";
private final String TLS_SERVER_KEY_FILE_PATH = "./src/test/resources/certificate/server.key";
@@ -54,7 +54,7 @@ public class BaseDiscoveryTestSetup {
config.setTlsCertificateFilePath(TLS_SERVER_CERT_FILE_PATH);
config.setTlsKeyFilePath(TLS_SERVER_KEY_FILE_PATH);
- mockZookKeeper = createMockZooKeeper();
+ mockZooKeeper = createMockZooKeeper();
service = spy(new DiscoveryService(config));
doReturn(mockZooKeeperClientFactory).when(service).getZooKeeperClientFactory();
service.start();
@@ -62,7 +62,7 @@ public class BaseDiscoveryTestSetup {
}
protected void cleanup() throws Exception {
- mockZookKeeper.shutdown();
+ mockZooKeeper.shutdown();
service.close();
}
@@ -81,7 +81,7 @@ public class BaseDiscoveryTestSetup {
public CompletableFuture<ZooKeeper> create(String serverList, SessionType sessionType,
int zkSessionTimeoutMillis) {
// Always return the same instance (so that we don't loose the mock ZK content on broker restart
- return CompletableFuture.completedFuture(mockZookKeeper);
+ return CompletableFuture.completedFuture(mockZooKeeper);
}
};
diff --git a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/DiscoveryServiceTest.java b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/DiscoveryServiceTest.java
index 576c2b8..339a7bf 100644
--- a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/DiscoveryServiceTest.java
+++ b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/DiscoveryServiceTest.java
@@ -83,7 +83,7 @@ public class DiscoveryServiceTest extends BaseDiscoveryTestSetup {
/**
* Verifies: Discovery-service returns broker is round-robin manner
- *
+ *
* @throws Exception
*/
@Test
@@ -106,7 +106,7 @@ public class DiscoveryServiceTest extends BaseDiscoveryTestSetup {
assertEquals(m.partitions, 0);
// Simulate ZK error
- mockZookKeeper.failNow(Code.SESSIONEXPIRED);
+ mockZooKeeper.failNow(Code.SESSIONEXPIRED);
TopicName topic2 = TopicName.get("persistent://test/local/ns/my-topic-2");
CompletableFuture<PartitionedTopicMetadata> future = service.getDiscoveryProvider()
.getPartitionedTopicMetadata(service, topic2, "role", null);
@@ -235,7 +235,7 @@ public class DiscoveryServiceTest extends BaseDiscoveryTestSetup {
for (int i = 0; i < number; i++) {
LoadReport report = new LoadReport(null, null, "pulsar://broker-:15000" + i, null);
String reportData = ObjectMapperFactory.getThreadLocal().writeValueAsString(report);
- ZkUtils.createFullPathOptimistic(mockZookKeeper, LOADBALANCE_BROKERS_ROOT + "/" + "broker-" + i,
+ ZkUtils.createFullPathOptimistic(mockZooKeeper, LOADBALANCE_BROKERS_ROOT + "/" + "broker-" + i,
reportData.getBytes(ZookeeperClientFactoryImpl.ENCODING_SCHEME), ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
}
diff --git a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/BaseZKStarterTest.java b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/BaseZKStarterTest.java
index 381deb6..019d167 100644
--- a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/BaseZKStarterTest.java
+++ b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/BaseZKStarterTest.java
@@ -34,14 +34,14 @@ import com.google.common.util.concurrent.MoreExecutors;
public class BaseZKStarterTest {
- protected MockZooKeeper mockZookKeeper;
+ protected MockZooKeeper mockZooKeeper;
protected void start() throws Exception {
- mockZookKeeper = createMockZooKeeper();
+ mockZooKeeper = createMockZooKeeper();
}
protected void close() throws Exception {
- mockZookKeeper.shutdown();
+ mockZooKeeper.shutdown();
}
/**
diff --git a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
index 1aa8464..b7535a3 100644
--- a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
+++ b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
@@ -102,7 +102,7 @@ public class DiscoveryServiceWebTest extends BaseZKStarterTest{
try {
LoadReport report = new LoadReport(broker, null, null, null);
String reportData = ObjectMapperFactory.getThreadLocal().writeValueAsString(report);
- ZkUtils.createFullPathOptimistic(mockZookKeeper, LOADBALANCE_BROKERS_ROOT + "/" + broker,
+ ZkUtils.createFullPathOptimistic(mockZooKeeper, LOADBALANCE_BROKERS_ROOT + "/" + broker,
reportData.getBytes(ZookeeperClientFactoryImpl.ENCODING_SCHEME), ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
} catch (KeeperException.NodeExistsException ne) {
@@ -118,7 +118,7 @@ public class DiscoveryServiceWebTest extends BaseZKStarterTest{
// 2. Setup discovery-zkcache
DiscoveryServiceServlet discovery = new DiscoveryServiceServlet();
- DiscoveryZooKeeperClientFactoryImpl.zk = mockZookKeeper;
+ DiscoveryZooKeeperClientFactoryImpl.zk = mockZooKeeper;
Field zkCacheField = DiscoveryServiceServlet.class.getDeclaredField("zkCache");
zkCacheField.setAccessible(true);
ZookeeperCacheLoader zkCache = new ZookeeperCacheLoader(new DiscoveryZooKeeperClientFactoryImpl(),
@@ -138,7 +138,7 @@ public class DiscoveryServiceWebTest extends BaseZKStarterTest{
ServiceConfig config = new ServiceConfig();
config.setWebServicePort(Optional.of(0));
ServerManager server = new ServerManager(config);
- DiscoveryZooKeeperClientFactoryImpl.zk = mockZookKeeper;
+ DiscoveryZooKeeperClientFactoryImpl.zk = mockZooKeeper;
Map<String, String> params = new TreeMap<>();
params.put("zookeeperServers", "dummy-value");
params.put("zookeeperClientFactoryClass", DiscoveryZooKeeperClientFactoryImpl.class.getName());
@@ -152,7 +152,7 @@ public class DiscoveryServiceWebTest extends BaseZKStarterTest{
final String broker = b + ":15000";
LoadReport report = new LoadReport("http://" + broker, null, null, null);
String reportData = ObjectMapperFactory.getThreadLocal().writeValueAsString(report);
- ZkUtils.createFullPathOptimistic(mockZookKeeper, LOADBALANCE_BROKERS_ROOT + "/" + broker,
+ ZkUtils.createFullPathOptimistic(mockZooKeeper, LOADBALANCE_BROKERS_ROOT + "/" + broker,
reportData.getBytes(ZookeeperClientFactoryImpl.ENCODING_SCHEME), ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
} catch (KeeperException.NodeExistsException ne) {
@@ -195,7 +195,7 @@ public class DiscoveryServiceWebTest extends BaseZKStarterTest{
config.setTlsCertificateFilePath(TLS_SERVER_CERT_FILE_PATH);
config.setTlsKeyFilePath(TLS_SERVER_KEY_FILE_PATH);
ServerManager server = new ServerManager(config);
- DiscoveryZooKeeperClientFactoryImpl.zk = mockZookKeeper;
+ DiscoveryZooKeeperClientFactoryImpl.zk = mockZooKeeper;
Map<String, String> params = new TreeMap<>();
params.put("zookeeperServers", "dummy-value");
params.put("zookeeperClientFactoryClass", DiscoveryZooKeeperClientFactoryImpl.class.getName());
@@ -212,7 +212,7 @@ public class DiscoveryServiceWebTest extends BaseZKStarterTest{
LoadReport report = new LoadReport("http://" + brokerUrl, "https://" + brokerUrlTls, null, null);
String reportData = ObjectMapperFactory.getThreadLocal().writeValueAsString(report);
- ZkUtils.createFullPathOptimistic(mockZookKeeper, LOADBALANCE_BROKERS_ROOT + "/" + brokerUrl,
+ ZkUtils.createFullPathOptimistic(mockZooKeeper, LOADBALANCE_BROKERS_ROOT + "/" + brokerUrl,
reportData.getBytes(ZookeeperClientFactoryImpl.ENCODING_SCHEME), ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
} catch (KeeperException.NodeExistsException ne) {
diff --git a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/ZookeeperCacheLoaderTest.java b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/ZookeeperCacheLoaderTest.java
index 0c43533..25ceb5d 100644
--- a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/ZookeeperCacheLoaderTest.java
+++ b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/ZookeeperCacheLoaderTest.java
@@ -62,7 +62,7 @@ public class ZookeeperCacheLoaderTest extends BaseZKStarterTest {
@Test
public void testZookeeperCacheLoader() throws InterruptedException, KeeperException, Exception {
- DiscoveryZooKeeperClientFactoryImpl.zk = mockZookKeeper;
+ DiscoveryZooKeeperClientFactoryImpl.zk = mockZooKeeper;
@SuppressWarnings("resource")
ZookeeperCacheLoader zkLoader = new ZookeeperCacheLoader(new DiscoveryZooKeeperClientFactoryImpl(), "", 30_000);
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerDiscoveryProvider.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerDiscoveryProvider.java
index e055872..b9b68c8 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerDiscoveryProvider.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerDiscoveryProvider.java
@@ -76,7 +76,7 @@ public class BrokerDiscoveryProvider implements Closeable {
config.getConfigurationStoreServers(), orderedExecutor, scheduledExecutorScheduler);
globalZkCache.start();
} catch (Exception e) {
- LOG.error("Failed to start Zookkeeper {}", e.getMessage(), e);
+ LOG.error("Failed to start ZooKeeper {}", e.getMessage(), e);
throw new PulsarServerException("Failed to start zookeeper :" + e.getMessage(), e);
}
}
diff --git a/site2/docs/io-debug.md b/site2/docs/io-debug.md
index a128d57..909e0c1 100644
--- a/site2/docs/io-debug.md
+++ b/site2/docs/io-debug.md
@@ -116,7 +116,7 @@ To clearly explain the log information, here breaks down the large block of info
```
* This piece of log information explains the configuration of consumers and clients, including the topic name, subscription name, subscription type, and so on.
```bash
- 08:21:56.719 [pulsar-client-io-1-1] INFO org.apache.pulsar.client.impl.ConsumerStatsRecorderImpl - Starting Pulsar consumer perf with config: {
+ 08:21:56.719 [pulsar-client-io-1-1] INFO org.apache.pulsar.client.impl.ConsumerStatsRecorderImpl - Starting Pulsar consumer status recorder with config: {
"topicNames" : [ "test-mongo" ],
"topicsPattern" : null,
"subscriptionName" : "public/default/pulsar-mongo-sink",
@@ -325,4 +325,4 @@ This checklist indicates the major areas to check when you debug connectors. It
* Use the `topics stats` command to get the stats for a specified topic and its connected producers and consumers.
* Check the connector log.
-* Enter into the external system and verify the result.
\ No newline at end of file
+* Enter into the external system and verify the result.
diff --git a/site2/website/release-notes.md b/site2/website/release-notes.md
index 89cf365..3742869 100644
--- a/site2/website/release-notes.md
+++ b/site2/website/release-notes.md
@@ -572,7 +572,7 @@ https://github.com/apache/pulsar/releases/tag/v2.4.0
* Make brokers read on closest Bookie in a multi-region deployment [#3171](https://github.com/apache/pulsar/pull/3171)
#### Fixes
- * Fixed deadlock in reusing ZookKeeper event thread [#3591](https://github.com/apache/pulsar/pull/3591)
+ * Fixed deadlock in reusing ZooKeeper event thread [#3591](https://github.com/apache/pulsar/pull/3591)
* In functions log topic appender, don't set producer name [#3544](https://github.com/apache/pulsar/pull/3544)
* When cursor recovery encounters empty cursor ledger, fallback to latest snapshot [#3487](https://github.com/apache/pulsar/pull/3487)
* Fixed C++ regex-consumer when using HTTP service URL [#3407](https://github.com/apache/pulsar/pull/3407)