Skip to content

[hotfix] fix problem caused by concurrent merge #9546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merlimat merged 2 commits into from
Feb 9, 2021
Merged

[hotfix] fix problem caused by concurrent merge #9546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf0037
fix problem caused by concurrent merge
aloyszhang Feb 9, 2021
9292682
Remove explicit timeout on PulsarFunctionE2ETest.testReadCompactedSink
merlimat Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down