Skip to content

[fix][test] Fix flaky test testCompactionPriority #26198

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
poorbarcode merged 3 commits into from
Jul 18, 2026
+21 −14
Merged

[fix][test] Fix flaky test testCompactionPriority #26198

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39482bd
Fix test
Technoboy- Jul 15, 2026
04a65c2
fix checkstyle
Technoboy- Jul 17, 2026
82a788a
address comments
Technoboy- Jul 17, 2026
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
35 changes: 21 additions & 14 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand All @@ -44,7 +45,6 @@
import io.grpc.netty.shaded.io.netty.util.concurrent.FastThreadLocal;
import jakarta.ws.rs.NotAcceptableException;
import jakarta.ws.rs.core.Response.Status;
import java.lang.reflect.Field;
import java.net.URI;
import java.net.URL;
import java.net.http.HttpClient;
Expand Down Expand Up @@ -72,7 +72,6 @@
import lombok.CustomLog;
import lombok.Data;
import org.apache.bookkeeper.mledger.AsyncCallbacks;
import org.apache.bookkeeper.mledger.ManagedLedger;
import org.apache.bookkeeper.mledger.ManagedLedgerException;
import org.apache.bookkeeper.mledger.impl.ManagedCursorImpl;
import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl;
Expand Down Expand Up @@ -3493,41 +3492,49 @@ public void testCompactionPriority() throws Exception {
final String namespace = newUniqueName(defaultTenant + "/ns");
admin.namespaces().createNamespace(namespace, Set.of("test"));
final String topic = "persistent://" + namespace + "/topic" + UUID.randomUUID();
pulsarClient.newProducer().topic(topic).create().close();
@Cleanup
Producer<byte[]> producer = pulsarClient.newProducer().topic(topic).create();
Comment thread
Technoboy- marked this conversation as resolved.
producer.send("message".getBytes());
TopicName topicName = TopicName.get(topic);
PersistentTopic persistentTopic = (PersistentTopic) pulsar.getBrokerService()
.getTopicIfExists(topic).get().get();
PersistentTopic mockTopic = spy(persistentTopic);
doReturn(CompletableFuture.completedFuture(null))
.when(mockTopic).triggerCompactionWithCheckHasMoreMessages();
mockTopic.checkCompaction();
// Disabled by default
verify(mockTopic, times(0)).triggerCompaction();
verify(mockTopic, times(0)).triggerCompactionWithCheckHasMoreMessages();
// Set namespace-level policy
admin.namespaces().setCompactionThreshold(namespace, 1);
Awaitility.await().untilAsserted(() ->
assertNotNull(admin.namespaces().getCompactionThreshold(namespace)));
ManagedLedger managedLedger = persistentTopic.getManagedLedger();
Field field = managedLedger.getClass().getDeclaredField("totalSize");
field.setAccessible(true);
field.setLong(managedLedger, 1000L);
Awaitility.await().untilAsserted(() -> assertTrue(persistentTopic.isCompactionEnabled()));

mockTopic.checkCompaction();
verify(mockTopic, times(1)).triggerCompaction();
Awaitility.await().untilAsserted(() -> {
mockTopic.checkCompaction();
verify(mockTopic, times(1)).triggerCompactionWithCheckHasMoreMessages();
});
//Set topic-level policy
admin.topics().setCompactionThreshold(topic, 0);
Awaitility.await().untilAsserted(() -> assertNotNull(admin.topics().getCompactionThreshold(topic)));
Awaitility.await().untilAsserted(() -> assertFalse(persistentTopic.isCompactionEnabled()));
mockTopic.checkCompaction();
verify(mockTopic, times(1)).triggerCompaction();
verify(mockTopic, times(1)).triggerCompactionWithCheckHasMoreMessages();
// Remove topic-level policy
admin.topics().removeCompactionThreshold(topic);
Awaitility.await().untilAsserted(() -> assertNull(admin.topics().getCompactionThreshold(topic)));
mockTopic.checkCompaction();
verify(mockTopic, times(2)).triggerCompaction();
Awaitility.await().untilAsserted(() -> assertTrue(persistentTopic.isCompactionEnabled()));
Awaitility.await().untilAsserted(() -> {
mockTopic.checkCompaction();
verify(mockTopic, times(2)).triggerCompactionWithCheckHasMoreMessages();
});
// Remove namespace-level policy
admin.namespaces().removeCompactionThreshold(namespace);
Awaitility.await().untilAsserted(() ->
assertNull(admin.namespaces().getCompactionThreshold(namespace)));
Awaitility.await().untilAsserted(() -> assertFalse(persistentTopic.isCompactionEnabled()));
mockTopic.checkCompaction();
verify(mockTopic, times(2)).triggerCompaction();
verify(mockTopic, times(2)).triggerCompactionWithCheckHasMoreMessages();
}

@Test
Expand Down
Loading