From 4cf0037f9fee2fbf11f4f8c45c26021a0327ff38 Mon Sep 17 00:00:00 2001 From: aloyszhang Date: Wed, 10 Feb 2021 00:08:31 +0800 Subject: [PATCH 1/2] fix problem caused by concurrent merge --- .../apache/pulsar/broker/admin/PersistentTopicsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 abfb37c7979a3..6411a9ab16720 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 @@ -243,7 +243,7 @@ public void testCreateSubscriptions() throws Exception{ verify(response, timeout(5000).times(1)).resume(responseCaptor.capture()); Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode()); - TopicStats topicStats = persistentTopics.getStats(testTenant, testNamespace, testLocalTopicName, true, true); + TopicStats topicStats = persistentTopics.getStats(testTenant, testNamespace, testLocalTopicName, true, true, false); long msgBacklog = topicStats.subscriptions.get(SUB_EARLIEST).msgBacklog; System.out.println("Message back log for " + SUB_EARLIEST + " is :" + msgBacklog); Assert.assertEquals(msgBacklog, numberOfMessages); @@ -256,7 +256,7 @@ public void testCreateSubscriptions() throws Exception{ responseCaptor = ArgumentCaptor.forClass(Response.class); verify(response, timeout(5000).times(1)).resume(responseCaptor.capture()); Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode()); - topicStats = persistentTopics.getStats(testTenant, testNamespace, testLocalTopicName, true, true); + topicStats = persistentTopics.getStats(testTenant, testNamespace, testLocalTopicName, true, true, false); msgBacklog = topicStats.subscriptions.get(SUB_LATEST).msgBacklog; System.out.println("Message back log for " + SUB_LATEST + " is :" + msgBacklog); Assert.assertEquals(msgBacklog, 0); @@ -269,7 +269,7 @@ public void testCreateSubscriptions() throws Exception{ responseCaptor = ArgumentCaptor.forClass(Response.class); verify(response, timeout(5000).times(1)).resume(responseCaptor.capture()); Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode()); - topicStats = persistentTopics.getStats(testTenant, testNamespace, testLocalTopicName, true, true); + topicStats = persistentTopics.getStats(testTenant, testNamespace, testLocalTopicName, true, true, false); msgBacklog = topicStats.subscriptions.get(SUB_NONE_MESSAGE_ID).msgBacklog; System.out.println("Message back log for " + SUB_NONE_MESSAGE_ID + " is :" + msgBacklog); Assert.assertEquals(msgBacklog, 0); From 929268262e704109fcf29c51d9019fd40af40ed6 Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Tue, 9 Feb 2021 10:40:42 -0800 Subject: [PATCH 2/2] Remove explicit timeout on PulsarFunctionE2ETest.testReadCompactedSink --- .../test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java index 78aad568d03ea..43da96cf4815f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java @@ -614,7 +614,7 @@ public void testReadCompactedFunction() throws Exception { producer.close(); } - @Test(timeOut = 30000) + @Test public void testReadCompactedSink() throws Exception { final String namespacePortion = "io"; final String replNamespace = tenant + "/" + namespacePortion;