You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by aa...@apache.org on 2019/08/25 03:01:59 UTC
[pulsar] 01/01: Update
This is an automated email from the ASF dual-hosted git repository.
aahmed pushed a commit to branch github_exp3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 87d42730d3d38d7cad461e91f668d926450c4c59
Author: Ali Ahmed <al...@gmail.com>
AuthorDate: Sat Aug 24 16:50:00 2019 -0700
Update
---
.github/workflows/ci.yaml | 12 +++---
.../pulsar/broker/service/BrokerService.java | 2 +-
.../broker/admin/AdminApiGetLastMessageIdTest.java | 4 +-
.../pulsar/broker/admin/AdminApiOffloadTest.java | 4 +-
.../broker/admin/AdminApiSchemaAutoUpdateTest.java | 4 +-
.../admin/AdminApiSchemaValidationEnforced.java | 4 +-
.../apache/pulsar/broker/admin/AdminApiTest2.java | 6 +--
.../pulsar/broker/admin/AdminApiTlsAuthTest.java | 4 +-
.../org/apache/pulsar/broker/admin/AdminTest.java | 4 +-
.../broker/admin/BrokerAdminClientTlsAuthTest.java | 6 +--
.../broker/admin/CreateSubscriptionTest.java | 4 +-
.../broker/admin/IncrementPartitionsTest.java | 4 +-
.../pulsar/broker/admin/PersistentTopicsTest.java | 4 +-
.../pulsar/broker/admin/v1/V1_AdminApiTest.java | 4 +-
.../broker/auth/MockedPulsarServiceBaseTest.java | 17 +++++----
.../broker/cache/ResourceQuotaCacheTest.java | 2 +-
.../AntiAffinityNamespaceGroupTest.java | 4 +-
.../loadbalance/ModularLoadManagerImplTest.java | 4 +-
.../loadbalance/SimpleLoadManagerImplTest.java | 4 +-
.../broker/lookup/http/HttpTopicLookupv2Test.java | 2 +-
.../namespace/NamespaceCreateBundlesTest.java | 4 +-
.../broker/namespace/NamespaceServiceTest.java | 4 +-
.../broker/namespace/NamespaceUnloadingTest.java | 4 +-
.../broker/namespace/OwnershipCacheTest.java | 4 +-
.../broker/service/AdvertisedAddressTest.java | 4 +-
.../broker/service/BrokerBookieIsolationTest.java | 4 +-
.../service/BrokerServiceThrottlingTest.java | 4 +-
.../pulsar/broker/service/MaxMessageSizeTest.java | 4 +-
.../pulsar/broker/service/PartitionKeyTest.java | 4 +-
.../service/PersistentTopicConcurrentTest.java | 2 +-
.../pulsar/broker/service/PersistentTopicTest.java | 4 +-
.../broker/service/ReplicatorGlobalNSTest.java | 2 +-
.../pulsar/broker/service/ServerCnxTest.java | 2 +-
.../broker/service/TopicTerminationTest.java | 4 +-
.../persistent/PersistentSubscriptionTest.java | 4 +-
...ReplicatedSubscriptionsSnapshotBuilderTest.java | 2 +-
.../broker/service/schema/SchemaServiceTest.java | 4 +-
...RegistryServiceWithSchemaDataValidatorTest.java | 2 +-
.../buffer/PersistentTransactionBufferTest.java | 4 +-
.../transaction/buffer/TransactionBufferTest.java | 4 +-
.../zookeeper/ZooKeeperClientAspectJTest.java | 4 +-
.../api/AuthenticatedProducerConsumerTest.java | 2 +-
.../AuthenticationTlsHostnameVerificationTest.java | 2 +-
.../api/AuthorizationProducerConsumerTest.java | 2 +-
.../org/apache/pulsar/client/api/BytesKeyTest.java | 4 +-
.../pulsar/client/api/DeadLetterTopicTest.java | 4 +-
.../client/api/DispatcherBlockConsumerTest.java | 4 +-
.../api/ExposeMessageRedeliveryCountTest.java | 4 +-
.../client/api/MutualAuthenticationTest.java | 4 +-
.../client/api/SimpleProducerConsumerStatTest.java | 4 +-
.../client/api/SimpleProducerConsumerTest.java | 4 +-
.../apache/pulsar/client/api/SimpleSchemaTest.java | 4 +-
.../pulsar/client/api/TlsProducerConsumerBase.java | 4 +-
.../client/api/v1/V1_ProducerConsumerBase.java | 4 +-
.../client/impl/BrokerClientIntegrationTest.java | 4 +-
.../pulsar/compaction/CompactedTopicTest.java | 4 +-
.../apache/pulsar/compaction/CompactionTest.java | 4 +-
.../service/web/DiscoveryServiceWebTest.java | 4 +-
.../worker/PulsarFunctionLocalRunTest.java | 2 +-
.../functions/worker/PulsarFunctionStateTest.java | 2 +-
.../worker/PulsarWorkerAssignmentTest.java | 2 +-
.../apache/pulsar/io/PulsarFunctionAdminTest.java | 4 +-
.../apache/pulsar/io/PulsarFunctionTlsTest.java | 4 +-
.../stats/client/PulsarBrokerStatsClientTest.java | 15 +++++---
.../apache/pulsar/utils/BasicRetryAnalyzer.java | 9 ++---
.../pulsar/utils/SimpleTextOutputStreamTest.java | 2 +-
.../apache/pulsar/utils/StatsOutputStreamTest.java | 2 +-
.../websocket/proxy/ProxyConfigurationTest.java | 4 +-
.../websocket/proxy/ProxyPublishConsumeTest.java | 4 +-
.../proxy/ProxyPublishConsumeWithoutZKTest.java | 2 +-
.../proxy/v1/V1_ProxyAuthenticationTest.java | 44 +++++++++++-----------
.../pulsar/client/admin/PulsarAdminException.java | 2 +-
72 files changed, 169 insertions(+), 164 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bf9de60..eae5966 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,11 +17,11 @@ jobs:
javac -version
mvn install
- - uses: actions/upload-artifact@master
- name: upload artifacts
- with:
- name: artifacts
- path: distribution/server/target/apache-pulsar-.*-bin.tar.gz
+ # - uses: actions/upload-artifact@master
+ # name: upload artifacts
+ # with:
+ # name: artifacts
+ # path: distribution/server/target/apache-pulsar-.*-bin.tar.gz
build-integration:
name: Integration tests
@@ -36,7 +36,7 @@ jobs:
java -version
javac -version
mvn install -Pdocker -DskipTests
- mvn -f tests/pom.xml test -DintegrationTests\
+ mvn -f tests/pom.xml test -DintegrationTests
cpp-integration:
name: C++ / Python tests
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index ba585b9..307342e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -495,7 +495,7 @@ public class BrokerService implements Closeable, ZooKeeperCacheListener<Policies
: createNonPersistentTopic(topicName);
});
} catch (IllegalArgumentException e) {
- log.warn("[{}] Illegalargument exception when loading topic", topic, e);
+ log.warn("[{}] Illegal argument exception when loading topic", topic, e);
return failedFuture(e);
} catch (RuntimeException e) {
Throwable cause = e.getCause();
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 c0228f6..2dca9c3 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
@@ -60,7 +60,7 @@ public class AdminApiGetLastMessageIdTest extends MockedPulsarServiceBaseTest {
}
@Override
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
protected void setup() throws Exception {
super.internalSetup();
admin.clusters().createCluster("test", new ClusterData(brokerUrl.toString()));
@@ -85,7 +85,7 @@ public class AdminApiGetLastMessageIdTest extends MockedPulsarServiceBaseTest {
}
@Override
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
protected void cleanup() throws Exception {
super.internalCleanup();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
index 8c67b23..d1265fc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
@@ -46,7 +46,7 @@ import org.testng.annotations.Test;
public class AdminApiOffloadTest extends MockedPulsarServiceBaseTest {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
conf.setManagedLedgerMaxEntriesPerLedger(10);
@@ -61,7 +61,7 @@ public class AdminApiOffloadTest extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace("prop-xyz/ns1", Sets.newHashSet("test"));
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaAutoUpdateTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaAutoUpdateTest.java
index 40848bb..362880d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaAutoUpdateTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaAutoUpdateTest.java
@@ -48,7 +48,7 @@ public class AdminApiSchemaAutoUpdateTest extends MockedPulsarServiceBaseTest {
private static final Logger LOG = LoggerFactory.getLogger(AdminApiSchemaAutoUpdateTest.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
super.internalSetup();
@@ -63,7 +63,7 @@ public class AdminApiSchemaAutoUpdateTest extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace("prop-xyz/test/ns2");
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 10000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaValidationEnforced.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaValidationEnforced.java
index 119b3b8..81c7804 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaValidationEnforced.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaValidationEnforced.java
@@ -49,7 +49,7 @@ public class AdminApiSchemaValidationEnforced extends MockedPulsarServiceBaseTes
private static final Logger LOG = LoggerFactory.getLogger(AdminApiSchemaValidationEnforced.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
super.internalSetup();
@@ -59,7 +59,7 @@ public class AdminApiSchemaValidationEnforced extends MockedPulsarServiceBaseTes
admin.tenants().createTenant("schema-validation-enforced", tenantInfo);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
index 4fc24ba..7ca7e50 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
@@ -86,13 +86,13 @@ public class AdminApiTest2 extends MockedPulsarServiceBaseTest {
private MockedPulsarService mockPulsarSetup;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
conf.setLoadBalancerEnabled(true);
super.internalSetup();
- // create otherbroker to test redirect on calls that need
+ // create other broker to test redirect on calls that need
// namespace ownership
mockPulsarSetup = new MockedPulsarService(this.conf);
mockPulsarSetup.setup();
@@ -104,7 +104,7 @@ public class AdminApiTest2 extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace("prop-xyz/ns1", Sets.newHashSet("test"));
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java
index d8cf234..76ed4c1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java
@@ -60,7 +60,7 @@ public class AdminApiTlsAuthTest extends MockedPulsarServiceBaseTest {
return String.format("./src/test/resources/authentication/tls-http/%s.pem", name);
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
conf.setLoadBalancerEnabled(true);
@@ -89,7 +89,7 @@ public class AdminApiTlsAuthTest extends MockedPulsarServiceBaseTest {
admin.close();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
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 9e64488..0563215 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
@@ -115,7 +115,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
}
@Override
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
super.internalSetup();
@@ -203,7 +203,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
}
@Override
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void cleanup() throws Exception {
super.internalCleanup();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java
index a925a59..c16cf4f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java
@@ -45,7 +45,7 @@ import org.testng.annotations.Test;
public class BrokerAdminClientTlsAuthTest extends MockedPulsarServiceBaseTest {
protected String methodName;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void beforeMethod(Method m) throws Exception {
methodName = m.getName();
}
@@ -54,7 +54,7 @@ public class BrokerAdminClientTlsAuthTest extends MockedPulsarServiceBaseTest {
return String.format("./src/test/resources/authentication/tls-http/%s.pem", name);
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
conf.setBrokerServicePortTls(Optional.of(BROKER_PORT_TLS));
@@ -81,7 +81,7 @@ public class BrokerAdminClientTlsAuthTest extends MockedPulsarServiceBaseTest {
conf.setTlsAllowInsecureConnection(true);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java
index 8632348..44886d5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java
@@ -37,14 +37,14 @@ import org.testng.annotations.Test;
public class CreateSubscriptionTest extends ProducerConsumerBase {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
super.internalSetup();
producerBaseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java
index 314491c..088bf5e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java
@@ -37,7 +37,7 @@ public class IncrementPartitionsTest extends MockedPulsarServiceBaseTest {
private MockedPulsarService mockPulsarSetup;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
conf.setLoadBalancerEnabled(true);
@@ -55,7 +55,7 @@ public class IncrementPartitionsTest extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace("prop-xyz/use/ns1");
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
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 0886f30..5f3dd30 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
@@ -74,7 +74,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
}
@Override
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
protected void setup() throws Exception {
super.internalSetup();
persistentTopics = spy(new PersistentTopics());
@@ -114,7 +114,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
}
@Override
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
protected void cleanup() throws Exception {
super.internalCleanup();
}
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 848501c..08b087a 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
@@ -136,7 +136,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
private NamespaceBundleFactory bundleFactory;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
conf.setLoadBalancerEnabled(true);
@@ -166,7 +166,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace("prop-xyz/use/ns1");
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
adminTls.close();
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 0767bef..72fa170 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
@@ -152,33 +152,36 @@ public abstract class MockedPulsarServiceBaseTest {
// an NPE in shutdown, obscuring the real error
if (admin != null) {
admin.close();
- admin = null;
}
if (pulsarClient != null) {
pulsarClient.close();
}
if (pulsar != null) {
pulsar.close();
- pulsar = null;
}
if (mockBookKeeper != null) {
mockBookKeeper.reallyShutdown();
- mockBookKeeper = null;
}
if (mockZookKeeper != null) {
mockZookKeeper.shutdown();
- mockZookKeeper = null;
}
if (sameThreadOrderedSafeExecutor != null) {
sameThreadOrderedSafeExecutor.shutdown();
- sameThreadOrderedSafeExecutor = null;
}
if (bkExecutor != null) {
bkExecutor.shutdown();
- bkExecutor = null;
}
+
+ admin = null;
+ pulsarClient = null;
+ pulsar = null;
+ mockBookKeeper = null;
+ mockZookKeeper = null;
+ sameThreadOrderedSafeExecutor = null;
+ bkExecutor = null;
+
} catch (Exception e) {
- log.warn("Failed to clean up mocked pulsar service:", e);
+ log.warn("Failed to clean up mocked pulsar service :", e);
throw e;
}
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/ResourceQuotaCacheTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/ResourceQuotaCacheTest.java
index 1f38d66..c09a248 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/ResourceQuotaCacheTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/ResourceQuotaCacheTest.java
@@ -69,7 +69,7 @@ public class ResourceQuotaCacheTest {
doReturn(localCache).when(pulsar).getLocalZkCacheService();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void teardown() {
executor.shutdown();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
index 171ad83..201af56 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
@@ -107,7 +107,7 @@ public class AntiAffinityNamespaceGroupTest {
return field.get(instance);
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
void setup() throws Exception {
// Start local bookkeeper ensemble
@@ -156,7 +156,7 @@ public class AntiAffinityNamespaceGroupTest {
Thread.sleep(100);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() throws Exception {
log.info("--- Shutting down ---");
executor.shutdown();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerImplTest.java
index 998cefd..1baf23e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerImplTest.java
@@ -142,7 +142,7 @@ public class ModularLoadManagerImplTest {
field.set(instance, value);
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
void setup() throws Exception {
// Start local bookkeeper ensemble
@@ -189,7 +189,7 @@ public class ModularLoadManagerImplTest {
Thread.sleep(100);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() throws Exception {
log.info("--- Shutting down ---");
executor.shutdown();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java
index d7c6519..3f54c1f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java
@@ -123,7 +123,7 @@ public class SimpleLoadManagerImplTest {
System.setProperty("test.basePort", "16100");
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
void setup() throws Exception {
// Start local bookkeeper ensemble
@@ -166,7 +166,7 @@ public class SimpleLoadManagerImplTest {
Thread.sleep(100);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() throws Exception {
log.info("--- Shutting down ---");
executor.shutdown();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/HttpTopicLookupv2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/HttpTopicLookupv2Test.java
index 5caa196..697b8ce 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/HttpTopicLookupv2Test.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/HttpTopicLookupv2Test.java
@@ -79,7 +79,7 @@ public class HttpTopicLookupv2Test {
private Set<String> clusters;
@SuppressWarnings("unchecked")
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setUp() throws Exception {
pulsar = mock(PulsarService.class);
ns = mock(NamespaceService.class);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceCreateBundlesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceCreateBundlesTest.java
index 7266fe6..c15a18d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceCreateBundlesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceCreateBundlesTest.java
@@ -28,14 +28,14 @@ import org.testng.annotations.Test;
public class NamespaceCreateBundlesTest extends BrokerTestBase {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
conf.setDefaultNumberOfNamespaceBundles(16);
super.baseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
index 5870e83..01b3042 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
@@ -83,13 +83,13 @@ import org.testng.annotations.Test;
public class NamespaceServiceTest extends BrokerTestBase {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.baseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceUnloadingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceUnloadingTest.java
index 5f9e878..2eca4db 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceUnloadingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceUnloadingTest.java
@@ -30,13 +30,13 @@ import org.testng.annotations.Test;
public class NamespaceUnloadingTest extends BrokerTestBase {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.baseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java
index ce9f272..0e32380 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java
@@ -69,7 +69,7 @@ public class OwnershipCacheTest {
private BrokerService brokerService;
private OrderedScheduler executor;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
final int port = 8080;
selfBrokerUrl = "tcp://localhost:" + port;
@@ -99,7 +99,7 @@ public class OwnershipCacheTest {
doReturn(selfBrokerUrl).when(pulsar).getSafeBrokerServiceUrl();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void teardown() throws Exception {
executor.shutdown();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java
index 87a3ae8..d06ac64 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java
@@ -45,7 +45,7 @@ public class AdvertisedAddressTest {
private final String advertisedAddress = "pulsar-usc.example.com";
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
bkEnsemble = new LocalBookkeeperEnsemble(3, ZOOKEEPER_PORT, () -> PortManager.nextFreePort());
bkEnsemble.start();
@@ -62,7 +62,7 @@ public class AdvertisedAddressTest {
pulsar.start();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void shutdown() throws Exception {
pulsar.close();
bkEnsemble.stop();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
index 1d396c0..18eb0c3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
@@ -92,14 +92,14 @@ public class BrokerBookieIsolationTest {
private final ObjectMapper jsonMapper = ObjectMapperFactory.create();
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
protected void setup() throws Exception {
// Start local bookkeeper ensemble
bkEnsemble = new LocalBookkeeperEnsemble(4, ZOOKEEPER_PORT, () -> PortManager.nextFreePort());
bkEnsemble.start();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
protected void cleanup() throws Exception {
if (pulsarService != null) {
pulsarService.close();
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 8c50710..7935705 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
@@ -52,13 +52,13 @@ import com.google.common.collect.Maps;
*/
public class BrokerServiceThrottlingTest extends BrokerTestBase {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.baseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MaxMessageSizeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MaxMessageSizeTest.java
index 78eff52..34b0aee 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MaxMessageSizeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MaxMessageSizeTest.java
@@ -51,7 +51,7 @@ public class MaxMessageSizeTest {
private final int ZOOKEEPER_PORT = PortManager.nextFreePort();
private final int BROKER_WEBSERVER_PORT = PortManager.nextFreePort();
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
void setup() {
try {
bkEnsemble = new LocalBookkeeperEnsemble(3, ZOOKEEPER_PORT, PortManager::nextFreePort);
@@ -85,7 +85,7 @@ public class MaxMessageSizeTest {
}
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() {
try {
pulsar.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PartitionKeyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PartitionKeyTest.java
index 5fea003..11c6b94 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PartitionKeyTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PartitionKeyTest.java
@@ -31,13 +31,13 @@ import org.testng.annotations.Test;
*/
@Test(timeOut = 10000)
public class PartitionKeyTest extends BrokerTestBase {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.baseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java
index d27d051..4567494 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java
@@ -73,7 +73,7 @@ public class PersistentTopicConcurrentTest extends MockedBookKeeperTestCase {
final String successSubName = "successSub";
private static final Logger log = LoggerFactory.getLogger(PersistentTopicTest.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup(Method m) throws Exception {
super.setUp(m);
ServiceConfiguration svcConfig = spy(new ServiceConfiguration());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
index ab42201..11ebb39 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
@@ -139,7 +139,7 @@ public class PersistentTopicTest {
final String successSubName3 = "successSub3";
private static final Logger log = LoggerFactory.getLogger(PersistentTopicTest.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
ServiceConfiguration svcConfig = spy(new ServiceConfiguration());
pulsar = spy(new PulsarService(svcConfig));
@@ -187,7 +187,7 @@ public class PersistentTopicTest {
setupMLAsyncCallbackMocks();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void teardown() throws Exception {
brokerService.getTopics().clear();
brokerService.close(); //to clear pulsarStats
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
index f2ad61b..4edeef9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
@@ -39,7 +39,7 @@ public class ReplicatorGlobalNSTest extends ReplicatorTestBase {
protected String methodName;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void beforeMethod(Method m) {
methodName = m.getName();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
index 803e675..c68af31 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
@@ -193,7 +193,7 @@ public class ServerCnxTest {
return (int) TimeUnit.SECONDS.convert(time, unit);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void teardown() throws Exception {
serverCnx.close();
channel.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicTerminationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicTerminationTest.java
index 64b6c62..bc9ff69 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicTerminationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicTerminationTest.java
@@ -50,13 +50,13 @@ import org.testng.annotations.Test;
@Test(timeOut = 10000)
public class TopicTerminationTest extends BrokerTestBase {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.baseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java
index b2ddd6c..5f44042 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java
@@ -92,7 +92,7 @@ public class PersistentSubscriptionTest {
private static final Logger log = LoggerFactory.getLogger(PersistentTopicTest.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
ServiceConfiguration svcConfig = spy(new ServiceConfiguration());
pulsarMock = spy(new PulsarService(svcConfig));
@@ -143,7 +143,7 @@ public class PersistentSubscriptionTest {
persistentSubscription = new PersistentSubscription(topic, subName, cursorMock, false);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void teardown() throws Exception {
brokerMock.close(); //to clear pulsarStats
try {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilderTest.java
index 22f1aa8..74eda1c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilderTest.java
@@ -54,7 +54,7 @@ public class ReplicatedSubscriptionsSnapshotBuilderTest {
private ReplicatedSubscriptionsController controller;
private List<ByteBuf> markers;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() {
clock = mock(Clock.class);
when(clock.millis()).thenAnswer(invocation -> currentTime);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/SchemaServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/SchemaServiceTest.java
index ce73e67..4abc1a9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/SchemaServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/SchemaServiceTest.java
@@ -82,7 +82,7 @@ public class SchemaServiceTest extends MockedPulsarServiceBaseTest {
private SchemaRegistryServiceImpl schemaRegistryService;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.internalSetup();
@@ -94,7 +94,7 @@ public class SchemaServiceTest extends MockedPulsarServiceBaseTest {
schemaRegistryService = new SchemaRegistryServiceImpl(storage, checkMap, MockClock);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidatorTest.java
index 135cba9..21b8bb8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidatorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidatorTest.java
@@ -48,7 +48,7 @@ public class SchemaRegistryServiceWithSchemaDataValidatorTest {
private SchemaRegistryService underlyingService;
private SchemaRegistryServiceWithSchemaDataValidator service;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() {
this.underlyingService = mock(SchemaRegistryService.class);
this.service = SchemaRegistryServiceWithSchemaDataValidator.of(underlyingService);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/PersistentTransactionBufferTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/PersistentTransactionBufferTest.java
index 7844871..465ba60 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/PersistentTransactionBufferTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/PersistentTransactionBufferTest.java
@@ -116,7 +116,7 @@ public class PersistentTransactionBufferTest extends MockedBookKeeperTestCase {
final String successTopicName = "persistent://prop/use/ns-abc/successTopic_txn";
private static final Logger log = LoggerFactory.getLogger(PersistentTransactionBufferTest.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
ServiceConfiguration svcConfig = spy(new ServiceConfiguration());
pulsar = spy(new PulsarService(svcConfig));
@@ -311,7 +311,7 @@ public class PersistentTransactionBufferTest extends MockedBookKeeperTestCase {
this.buffer = new PersistentTransactionBuffer(successTopicName, factory.open("hello"), brokerService);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void teardown() throws Exception {
brokerService.getTopics().clear();
brokerService.close(); //to clear pulsarStats
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferTest.java
index 0c5aa1d..b01569d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferTest.java
@@ -63,12 +63,12 @@ public class TransactionBufferTest {
this.provider = TransactionBufferProvider.newProvider(providerClassName);
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
this.buffer = this.provider.newTransactionBuffer().get();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
public void teardown() throws Exception {
this.buffer.closeAsync();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperClientAspectJTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperClientAspectJTest.java
index eaa4a6e..caa5646 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperClientAspectJTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperClientAspectJTest.java
@@ -124,13 +124,13 @@ public class ZooKeeperClientAspectJTest {
}
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
void setup() throws Exception {
localZkS = new ZookeeperServerTest(LOCAL_ZOOKEEPER_PORT);
localZkS.start();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void teardown() throws Exception {
localZkS.close();
}
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 5ddf18a..89ae108 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
@@ -116,7 +116,7 @@ public class AuthenticatedProducerConsumerTest extends ProducerConsumerBase {
.enableTls(true).build();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticationTlsHostnameVerificationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticationTlsHostnameVerificationTest.java
index e8436ac..631c7b3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticationTlsHostnameVerificationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticationTlsHostnameVerificationTest.java
@@ -124,7 +124,7 @@ public class AuthenticationTlsHostnameVerificationTest extends ProducerConsumerB
admin.namespaces().createNamespace("my-property/my-ns", Sets.newHashSet("test"));
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
if (!methodName.equals("testDefaultHostVerifier")) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java
index 9f5bc53..91cc443 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java
@@ -80,7 +80,7 @@ public class AuthorizationProducerConsumerTest extends ProducerConsumerBase {
super.init();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BytesKeyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BytesKeyTest.java
index 37da69b..d611616 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BytesKeyTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BytesKeyTest.java
@@ -28,14 +28,14 @@ import org.testng.annotations.Test;
public class BytesKeyTest extends ProducerConsumerBase {
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java
index fccde78..922d7df 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java
@@ -33,14 +33,14 @@ public class DeadLetterTopicTest extends ProducerConsumerBase {
private static final Logger log = LoggerFactory.getLogger(DeadLetterTopicTest.class);
- @BeforeMethod(timeOut = 10000)
+ @BeforeMethod(timeOut = 20000)
@Override
protected void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
}
- @AfterMethod(timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
index c62405d..182fa18 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
@@ -66,14 +66,14 @@ import com.google.common.collect.Sets;
public class DispatcherBlockConsumerTest extends ProducerConsumerBase {
private static final Logger log = LoggerFactory.getLogger(DispatcherBlockConsumerTest.class);
- @BeforeMethod(timeOut = 10000)
+ @BeforeMethod(timeOut = 20000)
@Override
protected void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
}
- @AfterMethod(timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java
index 18c4dde..1ce5b0b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java
@@ -28,14 +28,14 @@ import java.util.concurrent.TimeUnit;
public class ExposeMessageRedeliveryCountTest extends ProducerConsumerBase {
- @BeforeMethod(timeOut = 10000)
+ @BeforeMethod(timeOut = 20000)
@Override
protected void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
}
- @AfterMethod(timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MutualAuthenticationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MutualAuthenticationTest.java
index 3efe47e..1ec802d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MutualAuthenticationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MutualAuthenticationTest.java
@@ -182,7 +182,7 @@ public class MutualAuthenticationTest extends ProducerConsumerBase {
}
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
mutualAuth = new MutualAuthentication();
@@ -203,7 +203,7 @@ public class MutualAuthenticationTest extends ProducerConsumerBase {
super.producerBaseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerStatTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerStatTest.java
index d5bac99..c0796e4 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerStatTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerStatTest.java
@@ -51,14 +51,14 @@ import com.google.gson.JsonObject;
public class SimpleProducerConsumerStatTest extends ProducerConsumerBase {
private static final Logger log = LoggerFactory.getLogger(SimpleProducerConsumerStatTest.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.internalSetupForStatsTest();
super.producerBaseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
index 8fb5297..9dfc16d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
@@ -101,14 +101,14 @@ import org.testng.annotations.Test;
public class SimpleProducerConsumerTest extends ProducerConsumerBase {
private static final Logger log = LoggerFactory.getLogger(SimpleProducerConsumerTest.class);
- @BeforeMethod(timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
}
- @AfterMethod(timeOut = 10000)
+ @AfterMethod(timeOut = 30000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
index 6e31a70..978a17f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
@@ -57,7 +57,7 @@ public class SimpleSchemaTest extends ProducerConsumerBase {
}
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
conf.setSchemaValidationEnforced(schemaValidationEnforced);
@@ -66,7 +66,7 @@ public class SimpleSchemaTest extends ProducerConsumerBase {
super.producerBaseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerBase.java
index 65e9f7e..7fd199d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerBase.java
@@ -42,7 +42,7 @@ public class TlsProducerConsumerBase extends ProducerConsumerBase {
protected final String TLS_SERVER_KEY_FILE_PATH = "./src/test/resources/authentication/tls/broker-key.pem";
private final String clusterName = "use";
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
// TLS configuration for Broker
@@ -52,7 +52,7 @@ public class TlsProducerConsumerBase extends ProducerConsumerBase {
super.init();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerBase.java
index 84694f4..8eaeb98 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerBase.java
@@ -32,8 +32,8 @@ import org.testng.annotations.BeforeMethod;
public abstract class V1_ProducerConsumerBase extends MockedPulsarServiceBaseTest {
protected String methodName;
- @BeforeMethod( timeOut = 10000)
- public void beforeMethod(Method m) throws Exception {
+ @BeforeMethod(timeOut = 10000)
+ public void beforeMethod(Method m) {
methodName = m.getName();
}
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 01254d3..e368d52 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
@@ -223,8 +223,8 @@ public class BrokerClientIntegrationTest extends ProducerConsumerBase {
assertEquals(State.Ready, prod2.getState());
// unload ns-bundle2 as well
- pulsar.getNamespaceService().unloadNamespaceBundle((NamespaceBundle) bundle2);
- // let producer2 give some time to get disconnect signal and get disconencted
+ pulsar.getNamespaceService().unloadNamespaceBundle(bundle2);
+ // let producer2 give some time to get disconnect signal and get disconnected
Thread.sleep(200);
verify(producer2, atLeastOnce()).connectionClosed(any());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
index dbf67b7..bb908bd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
@@ -55,7 +55,7 @@ import org.testng.annotations.Test;
public class CompactedTopicTest extends MockedPulsarServiceBaseTest {
private final Random r = new Random(0);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
super.internalSetup();
@@ -67,7 +67,7 @@ public class CompactedTopicTest extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace("my-property/use/my-ns");
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
index c190c41..24ea73d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
@@ -70,7 +70,7 @@ public class CompactionTest extends MockedPulsarServiceBaseTest {
private ScheduledExecutorService compactionScheduler;
private BookKeeper bk;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
public void setup() throws Exception {
super.internalSetup();
@@ -85,7 +85,7 @@ public class CompactionTest extends MockedPulsarServiceBaseTest {
bk = pulsar.getBookKeeperClientFactory().create(this.conf, null, Optional.empty(), null);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
public void cleanup() throws Exception {
super.internalCleanup();
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 4a4a98c..c25913f 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
@@ -57,14 +57,14 @@ public class DiscoveryServiceWebTest extends ProducerConsumerBase {
private Client client = ClientBuilder.newClient(new ClientConfig().register(LoggingFeature.class));
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
@Override
protected void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
index 3e458bb..7491b96 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
@@ -279,7 +279,7 @@ public class PulsarFunctionLocalRunTest {
fileServerThread.start();
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() throws Exception {
log.info("--- Shutting down ---");
fileServer.stop(0);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionStateTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionStateTest.java
index bf61a23..9c07ed3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionStateTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionStateTest.java
@@ -214,7 +214,7 @@ public class PulsarFunctionStateTest {
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() throws Exception {
log.info("--- Shutting down ---");
pulsarClient.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
index 256adf5..500ea14 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
@@ -128,7 +128,7 @@ public class PulsarWorkerAssignmentTest {
Thread.sleep(100);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() {
log.info("--- Shutting down ---");
try {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
index 69399c4..594472b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
@@ -89,7 +89,7 @@ public class PulsarFunctionAdminTest {
private static final Logger log = LoggerFactory.getLogger(PulsarFunctionAdminTest.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
void setup(Method method) throws Exception {
log.info("--- Setting up method {} ---", method.getName());
@@ -161,7 +161,7 @@ public class PulsarFunctionAdminTest {
Thread.sleep(100);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() throws Exception {
log.info("--- Shutting down ---");
pulsarClient.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java
index b383707..8785ac6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java
@@ -88,7 +88,7 @@ public class PulsarFunctionTlsTest {
private static final Logger log = LoggerFactory.getLogger(PulsarFunctionTlsTest.class);
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
void setup(Method method) throws Exception {
log.info("--- Setting up method {} ---", method.getName());
@@ -149,7 +149,7 @@ public class PulsarFunctionTlsTest {
Thread.sleep(100);
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
void shutdown() throws Exception {
log.info("--- Shutting down ---");
functionAdmin.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
index 910b994..8681c03 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
@@ -43,6 +43,7 @@ import org.testng.annotations.Test;
import javax.ws.rs.ClientErrorException;
import javax.ws.rs.ServerErrorException;
import java.net.URL;
+import java.util.Random;
import java.util.concurrent.TimeUnit;
import static org.mockito.Mockito.spy;
@@ -84,20 +85,21 @@ public class PulsarBrokerStatsClientTest extends ProducerConsumerBase {
} catch (PulsarAdminException e) {
// Ok
}
+
+ assertTrue(client.getApiException(new ClientErrorException(400)) != null);
assertTrue(client.getApiException(new ClientErrorException(403)) instanceof NotAuthorizedException);
assertTrue(client.getApiException(new ClientErrorException(404)) instanceof NotFoundException);
assertTrue(client.getApiException(new ClientErrorException(409)) instanceof ConflictException);
assertTrue(client.getApiException(new ClientErrorException(412)) instanceof PreconditionFailedException);
- assertTrue(client.getApiException(new ClientErrorException(400)) instanceof PulsarAdminException);
assertTrue(client.getApiException(new ServerErrorException(500)) instanceof ServerSideErrorException);
- assertTrue(client.getApiException(new ServerErrorException(503)) instanceof PulsarAdminException);
+ assertTrue(client.getApiException(new ServerErrorException(503)) != null);
log.info("Client: {}", client);
admin.close();
}
- @Test(timeOut = 20000, retryAnalyzer = BasicRetryAnalyzer.class)
+ @Test(timeOut = 10000, retryAnalyzer = BasicRetryAnalyzer.class)
public void testTopicInternalStats() throws Exception {
log.info("-- Starting {} test --", methodName);
@@ -122,11 +124,14 @@ public class PulsarBrokerStatsClientTest extends ProducerConsumerBase {
}
PersistentTopic topic = (PersistentTopic) pulsar.getBrokerService().getOrCreateTopic(topicName).get();
+ // TODO: Adding Thread.sleep(1000); here before topic.getInternalStats() causes the test to fail
+ // TODO: Have to investigate why that is
PersistentTopicInternalStats internalStats = topic.getInternalStats();
CursorStats cursor = internalStats.cursors.get(subscriptionName);
assertEquals(cursor.numberOfEntriesSinceFirstNotAckedMessage, numberOfMsgs);
- assertTrue(cursor.totalNonContiguousDeletedMessagesRange > 0
- && (cursor.totalNonContiguousDeletedMessagesRange) < numberOfMsgs / 2);
+ assertTrue(cursor.totalNonContiguousDeletedMessagesRange > 0,
+ "totalNonContiguousDeletedMessagesRange = " + cursor.totalNonContiguousDeletedMessagesRange);
+ assertTrue(cursor.totalNonContiguousDeletedMessagesRange < numberOfMsgs / 2);
producer.close();
consumer.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/BasicRetryAnalyzer.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/BasicRetryAnalyzer.java
index 617a2fb..b643f90 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/BasicRetryAnalyzer.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/BasicRetryAnalyzer.java
@@ -23,13 +23,12 @@ import org.testng.ITestResult;
public class BasicRetryAnalyzer implements IRetryAnalyzer {
- int counter = 0;
- int retryLimit = 2;
+ private int counter = 1;
+ private final int retryLimit = 5;
@Override
- public boolean retry(ITestResult result) {
- if(counter < retryLimit)
- {
+ public boolean retry(final ITestResult result) {
+ if(counter < retryLimit) {
counter++;
return true;
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/SimpleTextOutputStreamTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/SimpleTextOutputStreamTest.java
index 8b4097e..360387f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/SimpleTextOutputStreamTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/SimpleTextOutputStreamTest.java
@@ -34,7 +34,7 @@ public class SimpleTextOutputStreamTest {
private ByteBuf buf;
private SimpleTextOutputStream stream;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void reset() {
buf = Unpooled.buffer(4096);
stream = new StatsOutputStream(buf);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/StatsOutputStreamTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/StatsOutputStreamTest.java
index db745f4..08c3895 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/StatsOutputStreamTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/StatsOutputStreamTest.java
@@ -33,7 +33,7 @@ public class StatsOutputStreamTest {
private ByteBuf buf;
private StatsOutputStream stream;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void reset() {
buf = Unpooled.buffer(4096);
stream = new StatsOutputStream(buf);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyConfigurationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyConfigurationTest.java
index 0b081a4..ca16bfc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyConfigurationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyConfigurationTest.java
@@ -37,7 +37,7 @@ import org.testng.annotations.Test;
public class ProxyConfigurationTest extends ProducerConsumerBase {
private WebSocketProxyConfiguration config;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
@@ -48,7 +48,7 @@ public class ProxyConfigurationTest extends ProducerConsumerBase {
config.setConfigurationStoreServers("dummy-zk-servers");
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
protected void cleanup() throws Exception {
super.internalCleanup();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
index 27a509c..82719da 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
@@ -80,7 +80,7 @@ public class ProxyPublishConsumeTest extends ProducerConsumerBase {
private static final int TIME_TO_CHECK_BACKLOG_QUOTA = 5;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
conf.setBacklogQuotaCheckIntervalInSeconds(TIME_TO_CHECK_BACKLOG_QUOTA);
@@ -99,7 +99,7 @@ public class ProxyPublishConsumeTest extends ProducerConsumerBase {
log.info("Proxy Server Started");
}
- @AfterMethod( timeOut = 10000)
+ @AfterMethod(timeOut = 20000)
protected void cleanup() throws Exception {
super.resetConfig();
super.internalCleanup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeWithoutZKTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeWithoutZKTest.java
index 2bc46e5..c3b019a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeWithoutZKTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeWithoutZKTest.java
@@ -50,7 +50,7 @@ public class ProxyPublishConsumeWithoutZKTest extends ProducerConsumerBase {
private ProxyServer proxyServer;
private WebSocketService service;
- @BeforeMethod( timeOut = 10000)
+ @BeforeMethod(timeOut = 30000)
public void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/v1/V1_ProxyAuthenticationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/v1/V1_ProxyAuthenticationTest.java
index aa08571..9a1a7a2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/v1/V1_ProxyAuthenticationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/v1/V1_ProxyAuthenticationTest.java
@@ -18,25 +18,7 @@
*/
package org.apache.pulsar.websocket.proxy.v1;
-import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
import com.google.common.collect.Sets;
-
-import java.net.URI;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.apache.bookkeeper.test.PortManager;
import org.apache.pulsar.client.api.v1.V1_ProducerConsumerBase;
import org.apache.pulsar.websocket.WebSocketService;
@@ -55,6 +37,22 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.net.URI;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.concurrent.Executors.newFixedThreadPool;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
public class V1_ProxyAuthenticationTest extends V1_ProducerConsumerBase {
private int port;
@@ -118,7 +116,7 @@ public class V1_ProxyAuthenticationTest extends V1_ProducerConsumerBase {
}
- public void socketTest() throws Exception {
+ private void checkSocket() throws Exception {
final String topic = "prop/use/my-ns/my-topic1";
final String consumerUri = "ws://localhost:" + port + "/ws/consumer/persistent/" + topic + "/my-sub";
final String producerUri = "ws://localhost:" + port + "/ws/producer/persistent/" + topic;
@@ -149,19 +147,19 @@ public class V1_ProxyAuthenticationTest extends V1_ProducerConsumerBase {
@Test(timeOut = 10000)
public void authenticatedSocketTest() throws Exception {
- socketTest();
+ checkSocket();
}
@Test(timeOut = 10000)
public void anonymousSocketTest() throws Exception {
- socketTest();
+ checkSocket();
}
@Test(timeOut = 10000)
- public void unauthenticatedSocketTest() throws Exception{
+ public void unauthenticatedSocketTest() {
Exception exception = null;
try {
- socketTest();
+ checkSocket();
} catch (Exception e) {
exception = e;
}
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
index cefbbdf..4865e8c 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
@@ -148,7 +148,7 @@ public class PulsarAdminException extends Exception {
}
public ServerSideErrorException(ServerErrorException e) {
- super(e, "Some error occourred on the server");
+ super(e, "Some error occurred on the server");
}
}