Skip to content

[ISSUE #10373] Fix quarantined flaky tests and remove CI rerun workflow #10379

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
lollipopjin merged 1 commit into from
May 26, 2026
Merged

[ISSUE #10373] Fix quarantined flaky tests and remove CI rerun workflow #10379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 0 additions & 22 deletions .github/workflows/rerun-workflow.yml
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions ...ava/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Ignore;

@RunWith(MockitoJUnitRunner.class)
public class TransactionalMessageServiceImplTest {
Expand Down Expand Up @@ -163,15 +162,14 @@ public void testDeletePrepareMessage_queueFull() throws InterruptedException {
assertThat(res).isFalse();
}

@Ignore("Flaky: fails 1/100 runs (1.0%)")
@Test
public void testDeletePrepareMessage_maxSize() throws InterruptedException {
brokerController.getBrokerConfig().setTransactionOpMsgMaxSize(1);
brokerController.getBrokerConfig().setTransactionOpBatchInterval(3000);
queueTransactionMsgService.open();
boolean res = queueTransactionMsgService.deletePrepareMessage(createMessageBrokerInner(1000, "test", "testHello"));
assertThat(res).isTrue();
verify(bridge, timeout(50)).writeOp(any(Integer.class), any(Message.class));
verify(bridge, timeout(3000)).writeOp(any(Integer.class), any(Message.class));
queueTransactionMsgService.close();
}

Expand Down
8 changes: 2 additions & 6 deletions client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQConsumerWithTraceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.apache.rocketmq.client.impl.consumer.DefaultMQPushConsumerImpl;
import org.apache.rocketmq.client.impl.consumer.ProcessQueue;
import org.apache.rocketmq.client.impl.consumer.PullAPIWrapper;
import org.apache.rocketmq.client.impl.consumer.PullMessageService;
import org.apache.rocketmq.client.impl.consumer.PullRequest;
import org.apache.rocketmq.client.impl.consumer.PullResultExt;
import org.apache.rocketmq.client.impl.consumer.RebalancePushImpl;
Expand Down Expand Up @@ -88,7 +87,6 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import org.junit.Ignore;

@RunWith(MockitoJUnitRunner.Silent.class)
public class DefaultMQConsumerWithTraceTest {
Expand Down Expand Up @@ -217,7 +215,6 @@ public void terminate() {
pushConsumer.shutdown();
}

@Ignore("Flaky: fails 1/100 runs (1.0%)")
@Test
public void testPullMessage_WithTrace_Success() throws InterruptedException, RemotingException, MQBrokerException, MQClientException {
traceProducer.getDefaultMQProducerImpl().getMqClientFactory().registerProducer(producerGroupTraceTemp, traceProducer.getDefaultMQProducerImpl());
Expand All @@ -234,9 +231,8 @@ public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs,
}
}));

PullMessageService pullMessageService = mQClientFactory.getPullMessageService();
pullMessageService.executePullRequestImmediately(createPullRequest());
countDownLatch.await(30, TimeUnit.SECONDS);
pushConsumer.getDefaultMQPushConsumerImpl().pullMessage(createPullRequest());
countDownLatch.await(10, TimeUnit.SECONDS);
MessageExt msg = messageAtomic.get();
assertThat(msg).isNotNull();
assertThat(msg.getTopic()).isEqualTo(topic);
Expand Down
16 changes: 5 additions & 11 deletions ...rc/test/java/org/apache/rocketmq/client/trace/DefaultMQLitePullConsumerWithTraceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import org.junit.Ignore;

@RunWith(MockitoJUnitRunner.class)
public class DefaultMQLitePullConsumerWithTraceTest {

Expand Down Expand Up @@ -118,6 +116,11 @@ public void init() throws Exception {
MQClientManager.getInstance(), "factoryTable", true);
factoryTable.forEach((clientId, instance) -> instance.shutdown());
factoryTable.clear();

Field field = RebalanceService.class.getDeclaredField("waitInterval");
field.setAccessible(true);
field.set(null, 100L);

mQClientFactory = null;
mqClientInstance = null;
traceMqClientInstance = null;
Expand Down Expand Up @@ -154,7 +157,6 @@ public void destroy() {
}
}

@Ignore("Flaky: fails 6/100 runs (6.0%)")
@Test
public void testSubscribe_PollMessageSuccess_WithDefaultTraceTopic() throws Exception {
DefaultLitePullConsumer litePullConsumer = createLitePullConsumerWithDefaultTraceTopic();
Expand All @@ -171,7 +173,6 @@ public void testSubscribe_PollMessageSuccess_WithDefaultTraceTopic() throws Exce
}
}

@Ignore("Flaky: fails 5/100 runs (5.0%)")
@Test
public void testSubscribe_PollMessageSuccess_WithCustomizedTraceTopic() throws Exception {
DefaultLitePullConsumer litePullConsumer = createLitePullConsumerWithCustomizedTraceTopic();
Expand Down Expand Up @@ -238,13 +239,6 @@ private void initDefaultLitePullConsumer(DefaultLitePullConsumer litePullConsume
mQClientFactory.getClientConfig().setDecodeReadBody(true);
field.set(litePullConsumerImpl, mQClientFactory);

field = MQClientInstance.class.getDeclaredField("rebalanceService");
field.setAccessible(true);
RebalanceService rebalanceService = (RebalanceService) field.get(mQClientFactory);
field = RebalanceService.class.getDeclaredField("waitInterval");
field.setAccessible(true);
field.set(rebalanceService, 100);

PullAPIWrapper pullAPIWrapper = litePullConsumerImpl.getPullAPIWrapper();
field = PullAPIWrapper.class.getDeclaredField("mQClientFactory");
field.setAccessible(true);
Expand Down
9 changes: 4 additions & 5 deletions filter/src/test/java/org/apache/rocketmq/filter/BloomFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.Random;

import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Ignore;

public class BloomFilterTest {

Expand Down Expand Up @@ -143,14 +142,14 @@ public void testBloomFilterData() {
assertThat(bloomFilter.isValid(bloomFilterData)).isFalse();
}

@Ignore("Flaky: fails 1/100 runs (1.0%)")
@Test
public void testCheckFalseHit() {
Random random = new Random(42);
BloomFilter bloomFilter = BloomFilter.createByFn(1, 300);
BitsArray bits = BitsArray.create(bloomFilter.getM());
int falseHit = 0;
for (int i = 0; i < bloomFilter.getN(); i++) {
String str = randomString((new Random(System.nanoTime())).nextInt(127) + 10);
String str = randomString(random, random.nextInt(127) + 10);
int[] bitPos = bloomFilter.calcBitPositions(str);

if (bloomFilter.checkFalseHit(bitPos, bits)) {
Expand All @@ -163,10 +162,10 @@ public void testCheckFalseHit() {
assertThat(falseHit).isLessThanOrEqualTo(bloomFilter.getF() * bloomFilter.getN() / 100);
}

private String randomString(int length) {
private String randomString(Random random, int length) {
StringBuilder stringBuilder = new StringBuilder(length);
for (int i = 0; i < length; i++) {
stringBuilder.append((char) ((new Random(System.nanoTime())).nextInt(123 - 97) + 97));
stringBuilder.append((char) (random.nextInt(26) + 'a'));
}

return stringBuilder.toString();
Expand Down
Loading