[pulsar] branch master updated: [hotfix] fix problem caused by concurrent merge (#9546)

[mmerli]

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

mmerli 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 e1c60143 [hotfix] fix problem caused by concurrent merge (#9546)
e1c60143 is described below

commit e1c60143d9213250f3ad8ac0e95ee15a8702ee9e
Author: Aloys <lofterzh...@gmail.com>
AuthorDate: Wed Feb 10 04:56:46 2021 +0800

    [hotfix] fix problem caused by concurrent merge (#9546)
    
    * fix problem caused by concurrent merge
    
    * Remove explicit timeout on PulsarFunctionE2ETest.testReadCompactedSink
    
    Co-authored-by: Matteo Merli <mme...@apache.org>
---
 .../java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java   | 6 +++---
 .../src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java   | 2 +-
 2 files changed, 4 insertions(+), 4 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 abfb37c..6411a9a 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 class PersistentTopicsTest extends 
MockedPulsarServiceBaseTest {
         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 class PersistentTopicsTest extends 
MockedPulsarServiceBaseTest {
         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 class PersistentTopicsTest extends 
MockedPulsarServiceBaseTest {
         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);
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 78aad56..43da96c 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 class PulsarFunctionE2ETest {
         producer.close();
     }
 
-    @Test(timeOut = 30000)
+    @Test
     public void testReadCompactedSink() throws Exception {
         final String namespacePortion = "io";
         final String replNamespace = tenant + "/" + namespacePortion;